OSDN Git Service
Android Build Merger (Role) [Thu, 21 Apr 2016 23:33:05 +0000 (23:33 +0000)]
Merge "Merge "Fix flag value collision" into nyc-dev am:
e5cebf7aaa am:
59311fb7c9" into nyc-mr1-dev-plus-aosp
Tim Murray [Thu, 21 Apr 2016 23:32:32 +0000 (23:32 +0000)]
Merge "Fix flag value collision" into nyc-dev am:
e5cebf7aaa
am:
bf4e2f742c
* commit '
bf4e2f742c81c136e4f4a7019026a09dce8a3d98':
Fix flag value collision
Change-Id: I45d049b899c2171957f8c005267928c07422a411
Tim Murray [Thu, 21 Apr 2016 23:32:29 +0000 (23:32 +0000)]
Merge "Fix flag value collision" into nyc-dev am:
e5cebf7aaa
am:
59311fb7c9
* commit '
59311fb7c911b6a2acbae82048d13d2c26adf3c6':
Fix flag value collision
Change-Id: Ic5e940b52967e6ec0a76f52ecdaadd620b350c50
John Reck [Thu, 21 Apr 2016 23:30:10 +0000 (23:30 +0000)]
Merge "Fix flag value collision" into nyc-dev
am:
e5cebf7aaa
* commit '
e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
Fix flag value collision
Change-Id: I3e37e772474b2a8d37d2bb4dcea41daa46e23c69
John Reck [Thu, 21 Apr 2016 23:30:10 +0000 (23:30 +0000)]
Merge "Fix flag value collision" into nyc-dev
am:
e5cebf7aaa
* commit '
e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
Fix flag value collision
Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
Tim Murray [Thu, 21 Apr 2016 22:59:40 +0000 (22:59 +0000)]
Merge "Fix flag value collision" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 22:45:31 +0000 (22:45 +0000)]
Merge "Merge changes I036fbc5f,I979f0107 into nyc-dev am:
60b688876d am:
a5f89b13a8" into nyc-mr1-dev-plus-aosp
Joe Onorato [Thu, 21 Apr 2016 22:45:06 +0000 (22:45 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev am:
60b688876d
am:
a5f89b13a8
* commit '
a5f89b13a8da8fd65421f32551e5fbb52146a837':
Change-Id: Ic7d850cec7f56a2e846d0f71934c21e5bc51a8de
Android Build Merger (Role) [Thu, 21 Apr 2016 22:43:06 +0000 (22:43 +0000)]
Merge "Merge changes I036fbc5f,I979f0107 into nyc-dev am:
60b688876d am:
a5f89b13a8" into nyc-mr1-dev-plus-aosp
Joe Onorato [Thu, 21 Apr 2016 22:42:45 +0000 (22:42 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev am:
60b688876d
am:
3d97be3a9a
* commit '
3d97be3a9a39cf33faab40f3378f2edcd60707b4':
If we can't call into an app process to deliver an intent, crash the process.
If a crash dialog can't be shown, just kill the process.
Change-Id: I6284544d57589993816df86320dc534e96ef557a
Joe Onorato [Thu, 21 Apr 2016 22:42:43 +0000 (22:42 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev am:
60b688876d
am:
a5f89b13a8
* commit '
a5f89b13a8da8fd65421f32551e5fbb52146a837':
If we can't call into an app process to deliver an intent, crash the process.
If a crash dialog can't be shown, just kill the process.
Change-Id: Ic0e9d7d849c36b120f14bf62c2608fe0116b67f7
John Reck [Thu, 21 Apr 2016 22:40:45 +0000 (15:40 -0700)]
Fix flag value collision
Bug:
28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
Joe Onorato [Thu, 21 Apr 2016 22:40:27 +0000 (22:40 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev
am:
60b688876d
* commit '
60b688876de79392236524b950381927878fa34f':
If we can't call into an app process to deliver an intent, crash the process.
If a crash dialog can't be shown, just kill the process.
Change-Id: Ie82f693507a546a560cf622d6830e50a9041543d
Joe Onorato [Thu, 21 Apr 2016 22:40:12 +0000 (22:40 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev
am:
60b688876d
* commit '
60b688876de79392236524b950381927878fa34f':
If we can't call into an app process to deliver an intent, crash the process.
If a crash dialog can't be shown, just kill the process.
Change-Id: I6691a982e84fefbd537010417e3fee2580cbd1b9
Jorim Jaggi [Thu, 21 Apr 2016 22:38:03 +0000 (22:38 +0000)]
Merge changes I7261cf87,Icabfcf47,I09e6b032,I252cf139,If85ade73, ... into nyc-dev am:
a51388d653
am:
a5a496e1d8
* commit '
a5a496e1d882cacc16a7e6083f4b462d3b75ec0b':
Change-Id: Ie91d94b1361adcc4a6f7dc752f37b41a7dfcae28
Chong Zhang [Thu, 21 Apr 2016 22:38:00 +0000 (22:38 +0000)]
Merge "Update divider controller\'s dim layer when the layer is changed" into nyc-dev am:
da3cd339e9
am:
8e95cfa1e1
* commit '
8e95cfa1e1fcfbd2a10c0c8215119ee6aa84eaf7':
Change-Id: I45362effb06d5278fcf080ccca928457f7ad838a
Joe Onorato [Thu, 21 Apr 2016 22:36:21 +0000 (22:36 +0000)]
Merge changes I036fbc5f,I979f0107 into nyc-dev
* changes:
If we can't call into an app process to deliver an intent, crash the process.
If a crash dialog can't be shown, just kill the process.
Jorim Jaggi [Thu, 21 Apr 2016 22:36:00 +0000 (22:36 +0000)]
Merge changes I7261cf87,Icabfcf47,I09e6b032,I252cf139,If85ade73, ... into nyc-dev am:
a51388d653
am:
9e1e02dcf9
* commit '
9e1e02dcf92924ca8da65cefa90ffbeab1932064':
Revert "Death to synchronous transactions (2/2)"
Fix a few weird state issues from race-conditions
Fix lifecycle bug in when calling positionTask
Animation fixes when task is not resumed
Keep stack from mReuseTask
Final fixes for growing recents transition
Change-Id: Iea0d0f2a39e29bd06da595dc5d57b7f980e32389
Chong Zhang [Thu, 21 Apr 2016 22:35:56 +0000 (22:35 +0000)]
Merge "Update divider controller\'s dim layer when the layer is changed" into nyc-dev am:
da3cd339e9
am:
0d4d105259
* commit '
0d4d105259bc952aab3cfb558215ec473824cf1b':
Update divider controller's dim layer when the layer is changed
Change-Id: Id170740970b46a5373e299e76c4fd4e2425f0332
Jorim Jaggi [Thu, 21 Apr 2016 22:33:36 +0000 (22:33 +0000)]
Merge changes I7261cf87,Icabfcf47,I09e6b032,I252cf139,If85ade73, ... into nyc-dev
am:
a51388d653
* commit '
a51388d6536bd57c2bbcf18e84d87763d388dbf7':
Revert "Death to synchronous transactions (2/2)"
Fix a few weird state issues from race-conditions
Fix lifecycle bug in when calling positionTask
Animation fixes when task is not resumed
Keep stack from mReuseTask
Final fixes for growing recents transition
Change-Id: I7f6ec0e8fa76b12229c4e7b53915eb152f1bfcfb
Chong Zhang [Thu, 21 Apr 2016 22:33:33 +0000 (22:33 +0000)]
Merge "Update divider controller\'s dim layer when the layer is changed" into nyc-dev
am:
da3cd339e9
* commit '
da3cd339e968b8f54575f72823eb2e4cd826aa02':
Update divider controller's dim layer when the layer is changed
Change-Id: Ib3f23a94476de4696600de4d5d649fb61e9581d8
Jorim Jaggi [Thu, 21 Apr 2016 22:33:21 +0000 (22:33 +0000)]
Merge changes I7261cf87,Icabfcf47,I09e6b032,I252cf139,If85ade73, ... into nyc-dev
am:
a51388d653
* commit '
a51388d6536bd57c2bbcf18e84d87763d388dbf7':
Revert "Death to synchronous transactions (2/2)"
Fix a few weird state issues from race-conditions
Fix lifecycle bug in when calling positionTask
Animation fixes when task is not resumed
Keep stack from mReuseTask
Final fixes for growing recents transition
Change-Id: Icccd53b5fbc4c3bde7723be261ba35ba73a99a1e
Chong Zhang [Thu, 21 Apr 2016 22:33:20 +0000 (22:33 +0000)]
Merge "Update divider controller\'s dim layer when the layer is changed" into nyc-dev
am:
da3cd339e9
* commit '
da3cd339e968b8f54575f72823eb2e4cd826aa02':
Update divider controller's dim layer when the layer is changed
Change-Id: I2fded43912f168eada58da94ab20ec0b572a3154
Joe Onorato [Wed, 20 Apr 2016 22:38:07 +0000 (15:38 -0700)]
If we can't call into an app process to deliver an intent, crash the process.
Rather than hoping the process will crash for some other reason, it is
better to just get rid of it right away. The Intent was not delivered,
so there are no guarantees that the app will continue to function
correctly.
Bug:
28196243
Change-Id: I036fbc5ffd42dc7259437cc5a733976478a2dd3a
TreeHugger Robot [Thu, 21 Apr 2016 22:28:00 +0000 (22:28 +0000)]
Merge changes I7261cf87,Icabfcf47,I09e6b032,I252cf139,If85ade73, ... into nyc-dev
* changes:
Revert "Death to synchronous transactions (2/2)"
Fix a few weird state issues from race-conditions
Fix lifecycle bug in when calling positionTask
Animation fixes when task is not resumed
Keep stack from mReuseTask
Final fixes for growing recents transition
Chong Zhang [Thu, 21 Apr 2016 22:27:51 +0000 (22:27 +0000)]
Merge "Update divider controller's dim layer when the layer is changed" into nyc-dev
Chong Zhang [Thu, 21 Apr 2016 22:17:47 +0000 (15:17 -0700)]
Update divider controller's dim layer when the layer is changed
The divider's layer assignment could change after the initial adjust
animation has finished.
bug:
28255739
Change-Id: I5899fe22e4fec680c49c881437c7f85d8ee9ca74
Jorim Jaggi [Thu, 21 Apr 2016 07:12:27 +0000 (07:12 +0000)]
Revert "Death to synchronous transactions (2/2)"
This reverts commit
dd05f0365aa0df9ba9a7631c8e02ed67f472132d.
There seems to be some logic that gets triggered inside surface flinger
regarding commit time of the transaction, and without it seems that
animations got jankier. No time to investigate...
Bug:
28305789
Change-Id: I7261cf8719d3528f8f5bee19e507b8ba88b8b729
Jorim Jaggi [Thu, 21 Apr 2016 07:07:29 +0000 (00:07 -0700)]
Fix a few weird state issues from race-conditions
- When starting another transition while the dock transition
is already set, always override that because that transition
starts prolonged animations which will never be ended.
- Only dock if we get a good UP event.
Bug:
28257206
Change-Id: Icabfcf475f419696d2bcff8fbb53cf3b29dedd69
Jorim Jaggi [Thu, 21 Apr 2016 05:42:32 +0000 (22:42 -0700)]
Fix lifecycle bug in when calling positionTask
Sometimes the resumed activity from another stack gets positioned
BELOW the top activity of the current stack. We need to carry over
the mResumedActivity to make sure onPause is called on the moved
activity.
Bug:
28235047
Change-Id: I09e6b032cd8d0b00dc5fdd06bec68e53c25aae73
Jorim Jaggi [Thu, 21 Apr 2016 03:37:45 +0000 (20:37 -0700)]
Animation fixes when task is not resumed
- Make sure to add the activity to mWaitingVisibleActivities
to not destroy the activity before the app transition has
started.
- Defer layouts in startActivityUnchecked so when clearing the
current activities in the current stack, we don't execute the
app transition yet. We need to wait until the new activities
are added as well.
Bug:
28026847
Change-Id: I252cf139e06197ea34329d1466f1f6162f3e7a30
Jorim Jaggi [Thu, 21 Apr 2016 00:58:29 +0000 (17:58 -0700)]
Keep stack from mReuseTask
When we launch an activity with CLEAR_TOP and NEW_TASK, we clear
all the activities in that task but then we don't reuse the stack,
which can lead to weirdness.
To fix this, we need to keep the target stack in that case.
Bug:
28000613
Change-Id: If85ade73b1036e8a7c0eda418d9f39e8596b8b16
Jorim Jaggi [Wed, 20 Apr 2016 03:03:47 +0000 (20:03 -0700)]
Final fixes for growing recents transition
- Make sure to reposition windows during animations to avoid that
they lag one frame behind.
- Don't put windows that are gone for layout into resizing mode.
- Don't layout windows that are gone for layout, to avoid resizing
the surface but the client won't draw anymore.
Change-Id: I809feffef00f9a086b44504126e03f509eb7f190
Fixes:
27855229
Vladislav Kaznacheev [Thu, 21 Apr 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am:
729c640cc8
am:
e574888a60
* commit '
e574888a609b7a36c059fab4cdcfab90fe948f9c':
Change-Id: I99ba69682f763583611b6006db22f5d7c43811cf
Hyunyoung Song [Thu, 21 Apr 2016 21:48:06 +0000 (21:48 +0000)]
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev am:
44157a4abf
am:
d9edb23fa8
* commit '
d9edb23fa88bb90eb3458c091536560ae1bffd96':
Change-Id: Ifc3714620b71ac050e658e247343993e8e09a0e5
Vladislav Kaznacheev [Thu, 21 Apr 2016 21:45:29 +0000 (21:45 +0000)]
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am:
729c640cc8
am:
45b1e14468
* commit '
45b1e1446863dbb0996576cc662651b314034ec9':
Rename DropPermissions to DragAndDropPermissions
Change-Id: Ica830b89e1bf54de72c8ca46747c96ea3e18972d
Hyunyoung Song [Thu, 21 Apr 2016 21:45:26 +0000 (21:45 +0000)]
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev am:
44157a4abf
am:
84e85f2e56
* commit '
84e85f2e5640b5abc824d25ba941ced9dbce46f5':
Fix broken build due to @RemotableViewMethod
Change-Id: I1b9e318c15f47dbded0b9490a10b957340cb432a
Vladislav Kaznacheev [Thu, 21 Apr 2016 21:43:08 +0000 (21:43 +0000)]
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am:
729c640cc8
* commit '
729c640cc887da9fe7a1b57121167a7bf83fee97':
Rename DropPermissions to DragAndDropPermissions
Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
Vladislav Kaznacheev [Thu, 21 Apr 2016 21:43:05 +0000 (21:43 +0000)]
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am:
729c640cc8
* commit '
729c640cc887da9fe7a1b57121167a7bf83fee97':
Rename DropPermissions to DragAndDropPermissions
Change-Id: I8b9481bd7167484bc98ddd12f5069edf88f2c0b1
Hyunyoung Song [Thu, 21 Apr 2016 21:43:04 +0000 (21:43 +0000)]
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
am:
44157a4abf
* commit '
44157a4abf36250f259eca4cdaa346be15d47738':
Fix broken build due to @RemotableViewMethod
Change-Id: Iad3e7a73952046d00e533ddb0ccabe28d3d646c6
Hyunyoung Song [Thu, 21 Apr 2016 21:43:03 +0000 (21:43 +0000)]
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
am:
44157a4abf
* commit '
44157a4abf36250f259eca4cdaa346be15d47738':
Fix broken build due to @RemotableViewMethod
Change-Id: I8ea8b32a7e57d479ee46bd8f43930f1ea53a5919
Vladislav Kaznacheev [Thu, 21 Apr 2016 21:34:24 +0000 (21:34 +0000)]
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
Hyunyoung Song [Thu, 21 Apr 2016 21:32:36 +0000 (21:32 +0000)]
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
Alan Viverette [Thu, 21 Apr 2016 21:31:32 +0000 (21:31 +0000)]
Merge "API review feedback for ProgressBar" into nyc-dev am:
5500bb1d6d
am:
c27d18d681
* commit '
c27d18d681b3b2e70640b0267b019ce174260799':
Change-Id: I52fd632de8392eaf775b11a3fbbb16a825f99a80
Alan Viverette [Thu, 21 Apr 2016 21:31:30 +0000 (21:31 +0000)]
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am:
e84393674d
am:
37ab66ab37
* commit '
37ab66ab37b09fb56a5d9d9f809d956b78e637d6':
Change-Id: I1fedad600d0b5598ecd91929cd9dc1212d504216
Alan Viverette [Thu, 21 Apr 2016 21:29:22 +0000 (21:29 +0000)]
Merge "API review feedback for ProgressBar" into nyc-dev am:
5500bb1d6d
am:
c1a3af4546
* commit '
c1a3af4546782846ef94e4ffd960133107707a88':
API review feedback for ProgressBar
Change-Id: I0bdf04c9e8a276479976d8647d208a7d95a4f506
Alan Viverette [Thu, 21 Apr 2016 21:29:18 +0000 (21:29 +0000)]
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am:
e84393674d
am:
d1fb914324
* commit '
d1fb9143244dcb46b28a0edbae88f8f5815d31bf':
Don't overwrite vertical and horizontal offsets unless explicit
Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f
Alan Viverette [Thu, 21 Apr 2016 21:27:06 +0000 (21:27 +0000)]
Merge "API review feedback for ProgressBar" into nyc-dev
am:
5500bb1d6d
* commit '
5500bb1d6d5d5c49f7bb5d81b48a707f1ade75ab':
API review feedback for ProgressBar
Change-Id: If6e1d8d9211b86030d8a678b6030df4cc50c9e77
Alan Viverette [Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)]
Merge "API review feedback for ProgressBar" into nyc-dev
am:
5500bb1d6d
* commit '
5500bb1d6d5d5c49f7bb5d81b48a707f1ade75ab':
API review feedback for ProgressBar
Change-Id: Ic011a46923ff66e89a8f9502d4e76bbbba22cd94
Alan Viverette [Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)]
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev
am:
e84393674d
* commit '
e84393674da0f5ecce2ee1074fc79c856f549623':
Don't overwrite vertical and horizontal offsets unless explicit
Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee
Alan Viverette [Thu, 21 Apr 2016 21:27:02 +0000 (21:27 +0000)]
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev
am:
e84393674d
* commit '
e84393674da0f5ecce2ee1074fc79c856f549623':
Don't overwrite vertical and horizontal offsets unless explicit
Change-Id: I9d68530848a578bcb015cbb586d777fc17b4c8ca
Hyunyoung Song [Thu, 21 Apr 2016 21:26:54 +0000 (14:26 -0700)]
Fix broken build due to @RemotableViewMethod
Change-Id: I63c6cb4fa68df114220efb2f263115e773e25f5d
Alan Viverette [Thu, 21 Apr 2016 21:21:55 +0000 (21:21 +0000)]
Merge "API review feedback for ProgressBar" into nyc-dev
Alan Viverette [Thu, 21 Apr 2016 21:21:33 +0000 (21:21 +0000)]
Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 21:10:55 +0000 (21:10 +0000)]
Merge "Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev am:
22d91b0eb4 am:
a51eb55a24" into nyc-mr1-dev-plus-aosp
Hyunyoung Song [Thu, 21 Apr 2016 21:10:32 +0000 (21:10 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev am:
22d91b0eb4
am:
a51eb55a24
* commit '
a51eb55a24c21d74e81619b988b17a39c85275cf':
Change-Id: Iade7f309c2202d41e171467b8f95778ad1e2892e
Android Build Merger (Role) [Thu, 21 Apr 2016 21:08:55 +0000 (21:08 +0000)]
Merge "Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev am:
22d91b0eb4 am:
a51eb55a24" into nyc-mr1-dev-plus-aosp
Hyunyoung Song [Thu, 21 Apr 2016 21:08:35 +0000 (21:08 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev am:
22d91b0eb4
am:
a51eb55a24
* commit '
a51eb55a24c21d74e81619b988b17a39c85275cf':
add @RemotableViewMethod to TextView#setEnabled b/
28304068
Change-Id: I3c4a3e7a7bbff6af38ff7e831fda6d20fcb62971
Hyunyoung Song [Thu, 21 Apr 2016 21:08:33 +0000 (21:08 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev am:
22d91b0eb4
am:
b99a507ec0
* commit '
b99a507ec06be926972f8920ce88ffac48632125':
add @RemotableViewMethod to TextView#setEnabled b/
28304068
Change-Id: I0b7175c11ff9698d912136ecc1a4502e89f237a6
Hyunyoung Song [Thu, 21 Apr 2016 21:06:24 +0000 (21:06 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev
am:
22d91b0eb4
* commit '
22d91b0eb40137e6236d7af5d2857df97648d15b':
add @RemotableViewMethod to TextView#setEnabled b/
28304068
Change-Id: I7d8f610e543ad1ef9937b342c04feb75774c0b23
Hyunyoung Song [Thu, 21 Apr 2016 21:06:21 +0000 (21:06 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev
am:
22d91b0eb4
* commit '
22d91b0eb40137e6236d7af5d2857df97648d15b':
add @RemotableViewMethod to TextView#setEnabled b/
28304068
Change-Id: Ib801e93f40e5a4bd40c11d309b20925ed2380626
Hyunyoung Song [Thu, 21 Apr 2016 21:04:23 +0000 (21:04 +0000)]
Merge "add @RemotableViewMethod to TextView#setEnabled b/
28304068" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 20:59:43 +0000 (20:59 +0000)]
Merge "Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am:
5da7a4a3f0 am:
0f1ed72a9a" into nyc-mr1-dev-plus-aosp
Chong Zhang [Thu, 21 Apr 2016 20:59:22 +0000 (20:59 +0000)]
Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am:
5da7a4a3f0
am:
0f1ed72a9a
* commit '
0f1ed72a9af60ebff6416165546630b42fd6f108':
Change-Id: I7897a148a4fb67d2151573f142dda3a7553aad74
Android Build Merger (Role) [Thu, 21 Apr 2016 20:57:51 +0000 (20:57 +0000)]
Merge "Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am:
5da7a4a3f0 am:
0f1ed72a9a" into nyc-mr1-dev-plus-aosp
Chong Zhang [Thu, 21 Apr 2016 20:57:27 +0000 (20:57 +0000)]
Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am:
5da7a4a3f0
am:
0f1ed72a9a
* commit '
0f1ed72a9af60ebff6416165546630b42fd6f108':
Make sure don't adjust IME when docked left-right
Change-Id: I5881b9d04e2a37ffab815a96e0d711dd3bb2ea69
Chong Zhang [Thu, 21 Apr 2016 20:57:25 +0000 (20:57 +0000)]
Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am:
5da7a4a3f0
am:
b35794163c
* commit '
b35794163ca40981967073f616edb28e6ca52706':
Make sure don't adjust IME when docked left-right
Change-Id: I2f7f195c855ed838079b06747e7e8ae8380e676f
Chong Zhang [Thu, 21 Apr 2016 20:55:11 +0000 (20:55 +0000)]
Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev
am:
5da7a4a3f0
* commit '
5da7a4a3f078b2a770fc36be8a3c0d9c522525f8':
Make sure don't adjust IME when docked left-right
Change-Id: I581b424e672807830a3937a1f9ed0797b6210089
Chong Zhang [Thu, 21 Apr 2016 20:55:10 +0000 (20:55 +0000)]
Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev
am:
5da7a4a3f0
* commit '
5da7a4a3f078b2a770fc36be8a3c0d9c522525f8':
Make sure don't adjust IME when docked left-right
Change-Id: Ied00ffadab7620c51563ed01eeb2b1ea5d81061d
Hyunyoung Song [Thu, 21 Apr 2016 20:41:56 +0000 (13:41 -0700)]
add @RemotableViewMethod to TextView#setEnabled
b/
28304068
Change-Id: Ia5464030a65c87dacdd75e5be331da017d7ef593
Android Build Merger (Role) [Thu, 21 Apr 2016 20:40:32 +0000 (20:40 +0000)]
Merge "Merge "Remove pre-N db after successful migration" into nyc-dev am:
cdb5fcf7b8 am:
d0a55f2ecb" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 21 Apr 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:
53c116f5da am:
f19fdfb08d" into nyc-mr1-dev-plus-aosp
Fyodor Kupolov [Thu, 21 Apr 2016 20:39:54 +0000 (20:39 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev am:
cdb5fcf7b8
am:
d0a55f2ecb
* commit '
d0a55f2ecb3371291ef086f737c1f5722ee995e7':
Change-Id: I248e7e08680695e7103ab099b4ecbdc088b9dfca
Jason Monk [Thu, 21 Apr 2016 20:39:51 +0000 (20:39 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:
53c116f5da
am:
f19fdfb08d
* commit '
f19fdfb08d1baee6738587eb2b68a993ff2dee6e':
Change-Id: I6c9141c0b764cdf80b43f60861ea77b684ef8196
Android Build Merger (Role) [Thu, 21 Apr 2016 20:38:06 +0000 (20:38 +0000)]
Merge "Merge "Remove pre-N db after successful migration" into nyc-dev am:
cdb5fcf7b8 am:
d0a55f2ecb" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 21 Apr 2016 20:37:53 +0000 (20:37 +0000)]
Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:
53c116f5da am:
f19fdfb08d" into nyc-mr1-dev-plus-aosp
Fyodor Kupolov [Thu, 21 Apr 2016 20:37:19 +0000 (20:37 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev am:
cdb5fcf7b8
am:
d0a55f2ecb
* commit '
d0a55f2ecb3371291ef086f737c1f5722ee995e7':
Remove pre-N db after successful migration
Change-Id: Ieabdea8b1093f46fcf54e43f0773c0c7175f0428
Fyodor Kupolov [Thu, 21 Apr 2016 20:37:16 +0000 (20:37 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev am:
cdb5fcf7b8
am:
8a7414ea55
* commit '
8a7414ea5550514920a09183727775ae92608810':
Remove pre-N db after successful migration
Change-Id: I93e2f2db8b6d23d3d483593317a9e2befd5c22d2
Jason Monk [Thu, 21 Apr 2016 20:37:16 +0000 (20:37 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:
53c116f5da
am:
f19fdfb08d
* commit '
f19fdfb08d1baee6738587eb2b68a993ff2dee6e':
QS: Use current tile state when removing custom tiles
Change-Id: I6f504f461e3cfe83011c50d0afdac8030f06e28e
Jason Monk [Thu, 21 Apr 2016 20:37:14 +0000 (20:37 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am:
53c116f5da
am:
644cbd668f
* commit '
644cbd668f2bd6ce2da90b445e918c445b71c851':
QS: Use current tile state when removing custom tiles
Change-Id: I1669594028b9321ddd424e2ea3aadf601b92a94c
Chong Zhang [Thu, 21 Apr 2016 20:35:26 +0000 (20:35 +0000)]
Merge "Make sure don't adjust IME when docked left-right" into nyc-dev
Fyodor Kupolov [Thu, 21 Apr 2016 20:35:05 +0000 (20:35 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev
am:
cdb5fcf7b8
* commit '
cdb5fcf7b81de81793995097b017c001be2a4264':
Remove pre-N db after successful migration
Change-Id: I3c45a3bc5bf26fccf5fd8b09e0d8e1989b8832a0
Fyodor Kupolov [Thu, 21 Apr 2016 20:35:02 +0000 (20:35 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev
am:
cdb5fcf7b8
* commit '
cdb5fcf7b81de81793995097b017c001be2a4264':
Remove pre-N db after successful migration
Change-Id: I343eb6688340bfca5b1ee16a6a85bf1f3e5c7632
Jason Monk [Thu, 21 Apr 2016 20:35:02 +0000 (20:35 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev
am:
53c116f5da
* commit '
53c116f5da0c5a8d0da5f046b892d7a106d4937a':
QS: Use current tile state when removing custom tiles
Change-Id: I73edc9a6029ed38e41abd0d8908a345b4631ad1e
Jason Monk [Thu, 21 Apr 2016 20:35:00 +0000 (20:35 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev
am:
53c116f5da
* commit '
53c116f5da0c5a8d0da5f046b892d7a106d4937a':
QS: Use current tile state when removing custom tiles
Change-Id: I07e850c997546909ae3ca83a0c2bde3ddc0beeee
Fyodor Kupolov [Thu, 21 Apr 2016 20:30:37 +0000 (20:30 +0000)]
Merge "Remove pre-N db after successful migration" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 20:26:30 +0000 (20:26 +0000)]
Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a am:
767c3e0df1" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 21 Apr 2016 20:26:09 +0000 (20:26 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a
am:
767c3e0df1
* commit '
767c3e0df1849b760b7f6b5011afaa06bcd92846':
Change-Id: I0011e7a74ba9bbb812a3dd49f70ed45733d0bf56
Jason Monk [Thu, 21 Apr 2016 20:25:31 +0000 (20:25 +0000)]
Merge "QS: Use current tile state when removing custom tiles" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:32 +0000 (20:24 +0000)]
Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a am:
767c3e0df1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:27 +0000 (20:24 +0000)]
Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a am:
a179d2035c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:21 +0000 (20:24 +0000)]
Merge "Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am:
6efc5dcb27 am:
608e919b3d" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 21 Apr 2016 20:23:53 +0000 (20:23 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a
am:
767c3e0df1
* commit '
767c3e0df1849b760b7f6b5011afaa06bcd92846':
Announce when volume controls appear and disappear.
Change-Id: I5e5e50ab49013cf390157ff5f97a59516cc5cd1a
Sid Soundararajan [Thu, 21 Apr 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am:
6efc5dcb27
am:
608e919b3d
* commit '
608e919b3d82faaec21c9e6e6a8bd47c150504fb':
Make Dismiss Icon under Cards show up only when focused.
Change-Id: Id61875edea2b596f13dc7938e85ae85462673428
Julia Reynolds [Thu, 21 Apr 2016 20:23:49 +0000 (20:23 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev am:
c14996393a
am:
a179d2035c
* commit '
a179d2035cdbbbbafcae4ef9e21090b303f38510':
Announce when volume controls appear and disappear.
Change-Id: I530c4fd88f7c72dfa41a136366fa6ad0baa5641b
Sid Soundararajan [Thu, 21 Apr 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am:
6efc5dcb27
am:
0565aa2491
* commit '
0565aa2491e6c3e9fe2b0b4b9f6ee5766874f8d9':
Make Dismiss Icon under Cards show up only when focused.
Change-Id: Iacd94569365756dac206ff64d632927facb7f748
Julia Reynolds [Thu, 21 Apr 2016 20:21:34 +0000 (20:21 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev
am:
c14996393a
* commit '
c14996393a976c1ca9ac7cef01a052614a84a7f4':
Announce when volume controls appear and disappear.
Change-Id: I6ba293a46f1a51413e1ca5c5ae17b5756dc37993
Sid Soundararajan [Thu, 21 Apr 2016 20:21:32 +0000 (20:21 +0000)]
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
am:
6efc5dcb27
* commit '
6efc5dcb274d08ba7dc812c90089bc10a38b890e':
Make Dismiss Icon under Cards show up only when focused.
Change-Id: I5bdd6346c01c432d268bcc23379a2311be5a7069
Julia Reynolds [Thu, 21 Apr 2016 20:21:31 +0000 (20:21 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev
am:
c14996393a
* commit '
c14996393a976c1ca9ac7cef01a052614a84a7f4':
Announce when volume controls appear and disappear.
Change-Id: I5299a15e93b2bdf50a55b48b072e3e45dc8a44bf
Sid Soundararajan [Thu, 21 Apr 2016 20:21:30 +0000 (20:21 +0000)]
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
am:
6efc5dcb27
* commit '
6efc5dcb274d08ba7dc812c90089bc10a38b890e':
Make Dismiss Icon under Cards show up only when focused.
Change-Id: Icf9af6b8c7dffffdc1d3a939049b9b764ccb6e9d
OSDN Git Service
