Brian Attwell
7ba4751e91
Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2"
2015-01-27 00:50:01 +00:00
Brian Attwell
63f859b2b7
Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2
...
Names are based on recent suggestions from the API council, such as
implemented inside ag/540453.
Bug: 18777272
Change-Id: I17a5b7cb4d4c5a0ba48936a6fc829acaab73f31d
2015-01-27 00:05:07 +00:00
Lorenzo Colitti
cd4c8525fa
am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
automerge: 583dec8
2015-01-26 22:24:23 +00:00
Lorenzo Colitti
583dec84d9
am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0
am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8
Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
2015-01-26 22:08:19 +00:00
Alan Viverette
d5f35c2022
am a6b93909: am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
...
* commit 'a6b9390949c4aa6f7de09fd0f44bb35ed7aabbc7':
Prevent drag-to-open from cycling pressed state, propagate hotspot
2015-01-26 19:35:44 +00:00
Alan Viverette
a6b9390949
am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
...
* commit 'e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
Prevent drag-to-open from cycling pressed state, propagate hotspot
2015-01-26 19:29:31 +00:00
Alan Viverette
e1eff7aade
am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
...
* commit 'de8d28405538128fad55e34dc7c74fd49a909ae6':
Prevent drag-to-open from cycling pressed state, propagate hotspot
2015-01-26 19:23:27 +00:00
Alan Viverette
2563095d2d
Prevent drag-to-open from cycling pressed state, propagate hotspot
...
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.
Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
2015-01-26 10:24:08 -08:00
Lorenzo Colitti
df59053588
Only try to fetch time from NTP if there is a network connection.
...
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
2015-01-26 15:24:07 +09:00
Zhijun He
503e815a6f
Camera2: add lens facing EXTERNAL enum
...
This is for usb camera support
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-23 23:58:45 +00:00
Svetoslav
166aa68630
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev automerge: 6e9f276
...
automerge: 9027d73
2015-01-23 22:38:30 +00:00
Svetoslav
9027d7355e
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
...
automerge: 6e9f276
2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
...
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4
Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
2015-01-23 22:22:18 +00:00
Brian Attwell
50f316051a
Merge "Expose ContentProviderOperation type"
2015-01-23 21:33:57 +00:00
Brian Attwell
1cf7405f1f
Expose ContentProviderOperation type
...
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery
JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.
Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.
Bug: 18777272
Change-Id: I6be5f325bbf6fbeb7817e9b1f7fa1a1ae2002e0b
2015-01-23 13:32:39 -08:00
Andres Morales
9662bb703e
Merge "check bootimage version string against system"
2015-01-23 20:54:13 +00:00
Andres Morales
7de24ce024
check bootimage version string against system
...
vendor version string may be empty
Bug: 19058575
Change-Id: I99f38183187a44cd200c5ddf8d5ff45ef80199d8
2015-01-23 12:49:40 -08:00
Chet Haase
34efbcedac
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev automerge: 458cc6a
...
automerge: f647cde
2015-01-23 18:11:51 +00:00
Prerepa Viswanadham
543945669b
am 76552bb9: am e77adabe: Don\'t compute flags length for scan response
...
automerge: 34c32f4
2015-01-23 18:10:40 +00:00
Chet Haase
f647cde899
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
...
automerge: 458cc6a
2015-01-23 18:07:14 +00:00
Chet Haase
458cc6a515
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
...
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
Allow infinite-repeat zero-duration animators to continue repeating
2015-01-23 18:04:03 +00:00
Prerepa Viswanadham
34c32f4034
am 76552bb9: am e77adabe: Don\'t compute flags length for scan response
...
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
Don't compute flags length for scan response
2015-01-23 18:01:54 +00:00
Chet Haase
af8c621d21
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963
am e77adabe: Don\'t compute flags length for scan response
...
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
Don't compute flags length for scan response
2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf
Don't compute flags length for scan response
...
Bug 19041626
Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
2015-01-23 17:51:43 +00:00
Lorenzo Colitti
98dd474f47
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 5c9546b
2015-01-23 13:05:26 +00:00
Lorenzo Colitti
5c9546b1da
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
2015-01-23 13:01:42 +00:00
Lorenzo Colitti
50f9d93a1c
am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
Support connecting to networks with misconfigured subnet masks.
2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a
Support connecting to networks with misconfigured subnet masks.
...
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
2015-01-23 21:10:34 +09:00
Jinsuk Kim
f6483ac515
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev automerge: 9ae7d49
...
automerge: 55055d6
2015-01-23 07:04:38 +00:00
Jinsuk Kim
55055d690e
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
...
automerge: 9ae7d49
2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
...
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
CEC: Add logic to return to internal source
2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513
Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
2015-01-23 06:51:58 +00:00
Lorenzo Colitti
e871f0176d
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
...
automerge: 6840ffa
2015-01-23 06:10:48 +00:00
Lorenzo Colitti
6840ffae67
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
...
automerge: fbaf6b3
2015-01-23 06:06:57 +00:00
Lorenzo Colitti
fbaf6b353d
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
...
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:03:46 +00:00
Lorenzo Colitti
78d51c2292
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456
Use the proper IpPrefix and LinkAddress constructors in VPN code.
...
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.
Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Svetoslav
41fceb462b
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
...
In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.
bug:18986806
Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
2015-01-22 18:51:47 -08:00
Chet Haase
d15e94f030
Allow infinite-repeat zero-duration animators to continue repeating
...
A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.
The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.
Issue #19113776 Fix infinite-repeating, zero-duration animator behavior
Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
2015-01-23 02:07:00 +00:00
Brian Attwell
9ffad071a9
Unhide AggregationSuggestions.Builder
...
Additional unbundling from ContactsContract.
I'm going to remove all parameter types except name.
None of them have been implemented since they were
defined in ICS.
Bug: 18777272
Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
2015-01-23 01:54:30 +00:00
Eino-Ville Talvala
ac829206a9
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 automerge: 0ec0465
...
automerge: 92baed1
2015-01-23 00:55:23 +00:00
Eino-Ville Talvala
92baed1212
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5
...
automerge: 0ec0465
2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
0ec0465542
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
...
automerge: 7fde5e5
2015-01-23 00:08:32 +00:00
Eino-Ville Talvala
7fde5e5ba3
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
2015-01-23 00:05:26 +00:00
Brian Attwell
09341baa8e
Merge "Revert "Expose ContentProviderOperation type""
2015-01-22 20:54:53 +00:00
