George Mount
206db8a70f
am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a
...
automerge: 5c25f5b
2015-01-27 23:30:18 +00:00
Alan Viverette
d8111138ab
resolve merge conflicts of e5743753 to master.
...
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
2015-01-27 15:23:09 -08:00
Wale Ogunwale
783f28691e
Merge "Support activities in the same process having different resources."
2015-01-27 22:24:15 +00:00
Craig Mautner
1ab8674be0
Merge "Eliminate groupId and add task to AppWindowToken"
2015-01-27 22:15:19 +00:00
Craig Mautner
83162a9027
Eliminate groupId and add task to AppWindowToken
...
Simplifies access by eliminating indirect referencing.
Fixes bug 18088522 item #15 .
Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
2015-01-27 13:56:20 -08:00
Alan Viverette
d8c2af5542
Fix build
...
Change-Id: I134e40dbabcb9b111b3d7851a7adc247f5c92e3b
2015-01-27 13:35:14 -08:00
Jose Lima
ceba619e36
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
automerge: 69fbcf1
2015-01-27 17:57:04 +00:00
Chris Craik
b018835dc7
am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
automerge: 2da67b5
2015-01-27 17:53:00 +00:00
Alan Viverette
2a05ae733b
resolve merge conflicts of da9653a to master.
...
Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1
2015-01-27 09:48:47 -08:00
Wale Ogunwale
60454dbc4d
Support activities in the same process having different resources.
...
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.
Bug: 19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
2015-01-27 07:50:58 -08:00
George Mount
5c25f5b0a7
am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a
...
* commit 'fff84a232a964a8587eabee4e34cc38344309593':
Activity Transition: fix quick back after enter.
2015-01-27 15:21:23 +00:00
George Mount
fff84a232a
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
...
automerge: aa6945a
2015-01-27 15:15:38 +00:00
George Mount
aa6945ac79
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
2015-01-27 15:13:32 +00:00
Svetoslav
e5743753ee
am 55120a0f: am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
...
* commit '55120a0f1acb9a46dc56bbdab877bc2c635f1356':
Accessibility: Ignore overlapping siblings when computing a click location
2015-01-27 04:36:31 +00:00
Svetoslav
55120a0f1a
am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
...
* commit '197adec3656fc087d4aa56396e601bb8d04aa9fd':
Accessibility: Ignore overlapping siblings when computing a click location
2015-01-27 04:26:51 +00:00
Svetoslav
197adec365
Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
2015-01-27 04:23:44 +00:00
Jose Lima
69fbcf1f10
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '445768bddf00256195a46b78ed35ea3722df7c92':
Allow disabling the Options Pannel feature for TVs
2015-01-27 03:10:28 +00:00
Jose Lima
445768bddf
am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
Allow disabling the Options Pannel feature for TVs
2015-01-27 02:58:44 +00:00
Jose Lima
3fd8a433a9
Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
2015-01-27 02:53:22 +00:00
Jose Lima
7a22fc62d3
Allow disabling the Options Pannel feature for TVs
...
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.
Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
2015-01-26 17:39:49 -08:00
Chris Craik
2da67b570c
am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
* commit '00c53d66dd56384aff834ec2c59de9f3c3913579':
Invalidate outline on padding update
2015-01-27 01:37:09 +00:00
Alan Viverette
da9653a263
am 8648dfe5: am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
...
* commit '8648dfe5f52f131b0af1a17a383ce11d213cedc2':
Convert getHourForDegrees result to 12-hour format when needed
2015-01-27 01:37:03 +00:00
Chris Craik
00c53d66dd
am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
Invalidate outline on padding update
2015-01-27 01:13:00 +00:00
Alan Viverette
8648dfe5f5
am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
...
* commit '5229be05b439cf24b7028adbb64d05ecc23184ac':
Convert getHourForDegrees result to 12-hour format when needed
2015-01-27 01:12:56 +00:00
Chris Craik
cdd8b7f819
Merge "Invalidate outline on padding update" into lmp-mr1-dev
2015-01-27 01:08:54 +00:00
Alan Viverette
5229be05b4
Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
2015-01-27 01:02:00 +00:00
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
George Mount
fbd459642f
Activity Transition: fix quick back after enter.
...
Bug 19105460
When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.
Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
2015-01-26 15:59:42 -08:00
Alan Viverette
5efe0d199e
Convert getHourForDegrees result to 12-hour format when needed
...
Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.
Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
2015-01-26 15:34:56 -08:00
Chris Craik
c43a820945
Invalidate outline on padding update
...
bug:19113359
Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.
Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
2015-01-26 14:40:29 -08: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
Svetoslav
a1ac6a0925
Accessibility: Ignore overlapping siblings when computing a click location
...
To click a view we were computing a click location by ignoring overlapping
views that are actionable. However, detection whether a view is actionable
is not always possible as the view may handle touch events directly. This
leads to unhandled edge cases. We are taking a conservative approach and
ignore all overlapping siblings regardless if clickable. This is also has
limitations but hopefully less frequent edge cases.
bug:18889611
Change-Id: Icea0b7b3e2d4ed53e50e01cb6a99b880be560b14
2015-01-23 16:13:43 -08: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
