OSDN Git Service
Selim Cinek [Fri, 22 Apr 2016 03:40:32 +0000 (03:40 +0000)]
Merge "Fixed a crash when the heads up content view was null" into nyc-dev
am:
841e4946bf
* commit '
841e4946bf3f6cbbc4a84d849de675f1d6296a02':
Fixed a crash when the heads up content view was null
Change-Id: I7bfb0889584b971ff8fe0e7e2193fc146e0ebd9b
Selim Cinek [Fri, 22 Apr 2016 03:40:30 +0000 (03:40 +0000)]
Merge "Changed the name of chronometer countdown" into nyc-dev
am:
8f32cd4306
* commit '
8f32cd4306a201c2167c20fc636fe613f1fabd4c':
Changed the name of chronometer countdown
Change-Id: Id89cb8d2bf201752bab018d25068841714405c3b
Selim Cinek [Fri, 22 Apr 2016 03:22:12 +0000 (03:22 +0000)]
Merge "Fixed a crash when the heads up content view was null" into nyc-dev
Selim Cinek [Fri, 22 Apr 2016 03:21:50 +0000 (03:21 +0000)]
Merge "Changed the name of chronometer countdown" into nyc-dev
Erik Kline [Fri, 22 Apr 2016 03:21:47 +0000 (03:21 +0000)]
Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev
am:
5486aabc74
* commit '
5486aabc747501da868985a9df5e4d24d2395fda':
IpManager,DhcpClient: catch some errors and better logging
Change-Id: Idc9d3d0aefbd7dedaa31a2f21b06ca80f4383c30
Jorim Jaggi [Fri, 22 Apr 2016 03:21:46 +0000 (03:21 +0000)]
Merge "Fix squished UI elements" into nyc-dev
am:
42a6dc9bd6
* commit '
42a6dc9bd6cd5028ab65f456fe7cc4d8a7fd77c8':
Fix squished UI elements
Change-Id: I6a86c75799f8352bad08ed8170e65d7b5f7eedbe
Paul Crowley [Fri, 22 Apr 2016 03:21:44 +0000 (03:21 +0000)]
Merge "Clear calling identity before calling mountService" into nyc-dev
am:
a482c6e5e6
* commit '
a482c6e5e61c2c01502a344240ef596dfbe84f26':
Clear calling identity before calling mountService
Change-Id: I778323b472c0ec40087e8fbf19caa23913159f50
Erik Kline [Fri, 22 Apr 2016 03:14:04 +0000 (03:14 +0000)]
Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev
Jorim Jaggi [Fri, 22 Apr 2016 03:09:58 +0000 (03:09 +0000)]
Merge "Fix squished UI elements" into nyc-dev
Paul Crowley [Fri, 22 Apr 2016 03:00:10 +0000 (03:00 +0000)]
Merge "Clear calling identity before calling mountService" into nyc-dev
Jorim Jaggi [Fri, 22 Apr 2016 01:25:49 +0000 (18:25 -0700)]
Fix squished UI elements
Stack bounds were wrong after moving all tasks from docked stack to
fullscreen stack, if fullscreen stack was created while moving.
This lead to very wrong bounds when rotating the screen the next
time.
Bug:
27870534
Change-Id: I6d054922ffc7baa7cd1a86d0d3448050cbacd21f
Christopher Tate [Fri, 22 Apr 2016 00:50:54 +0000 (00:50 +0000)]
Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev
am:
0a7ec886c3
* commit '
0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1':
Don't worry about an extra weak indirection with callback alarms
Change-Id: I961f330a5af87881d2a05d0712096faa33c1272d
Dake Gu [Fri, 22 Apr 2016 00:50:52 +0000 (00:50 +0000)]
Merge "leanback: Fix link to changed API setTitle()" into nyc-dev
am:
dca499fdad
* commit '
dca499fdadff67b954883f2260f79850d65d1b97':
leanback: Fix link to changed API setTitle()
Change-Id: Ic4f9fcd50d4cf14f21d11d3055c1684f08feefaa
Chris Tate [Fri, 22 Apr 2016 00:40:42 +0000 (00:40 +0000)]
Merge "Don't worry about an extra weak indirection with callback alarms" into nyc-dev
Dake Gu [Fri, 22 Apr 2016 00:26:51 +0000 (00:26 +0000)]
Merge "leanback: Fix link to changed API setTitle()" into nyc-dev
Daichi Hirono [Fri, 22 Apr 2016 00:12:19 +0000 (00:12 +0000)]
Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev
am:
4dfde6079c
* commit '
4dfde6079c492ab0f54e699c367abf89a5e0dfa3':
Add throws definition to MtpDevice#readEvent.
Change-Id: I0dbb683db01ef67de04b57bf605dfda6aeeb7752
Daichi Hirono [Fri, 22 Apr 2016 00:12:17 +0000 (00:12 +0000)]
Merge "Handle API review comments from the council." into nyc-dev
am:
b9c64cd2c0
* commit '
b9c64cd2c06933eda7ff1e691b80c53a74ff09d7':
Handle API review comments from the council.
Change-Id: If37e15af289c47660b28ad637d8f42a861e742a5
Selim Cinek [Fri, 22 Apr 2016 00:12:14 +0000 (00:12 +0000)]
Merge "Switched the notification time to relative time" into nyc-dev
am:
037235d83e
* commit '
037235d83edcc78aab8798a0b221b6f14d9e15f3':
Switched the notification time to relative time
Change-Id: I5d1ac3edbb140a2947c1e64916a2fe72b444ef4e
Daichi Hirono [Fri, 22 Apr 2016 00:00:31 +0000 (00:00 +0000)]
Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev
Daichi Hirono [Fri, 22 Apr 2016 00:00:31 +0000 (00:00 +0000)]
Merge "Handle API review comments from the council." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 23:47:22 +0000 (23:47 +0000)]
Merge "Switched the notification time to relative time" into nyc-dev
Adam Powell [Thu, 21 Apr 2016 23:30:11 +0000 (23:30 +0000)]
Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
am:
ee4ee262c6
* commit '
ee4ee262c674cf0a20cf294ecfe4b8736cf6c983':
Move child FragmentManager shutdown for retained fragments
Change-Id: Ifca43aa119216143eaf55e531a99dd3825cf8816
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
Adam Powell [Thu, 21 Apr 2016 23:05:01 +0000 (23:05 +0000)]
Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
Tim Murray [Thu, 21 Apr 2016 22:59:40 +0000 (22:59 +0000)]
Merge "Fix flag value collision" into nyc-dev
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: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
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: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
Selim Cinek [Thu, 21 Apr 2016 00:10:40 +0000 (17:10 -0700)]
Fixed a crash when the heads up content view was null
Change-Id: I02c47eb0f4bcc3620103882e34b079aa83790a44
Fixes:
28301534
Selim Cinek [Wed, 20 Apr 2016 23:13:59 +0000 (16:13 -0700)]
Changed the name of chronometer countdown
Change-Id: Ie0339205b26f2dff40e0c19760750a0ce6aaf7da
Fixes:
28295825
Selim Cinek [Wed, 20 Apr 2016 01:31:47 +0000 (18:31 -0700)]
Switched the notification time to relative time
The time is now displayed in a relative manner instead
of absolute.
Change-Id: Idcc4411ed07991b6e176c4890a0d804394d8598a
Fixes:
27435284
Christopher Tate [Thu, 21 Apr 2016 22:05:34 +0000 (15:05 -0700)]
Don't worry about an extra weak indirection with callback alarms
Bug
27995384
Change-Id: Ie9cf3e05dca4af7085b479fb65d4cf45ee0239ba
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
Dake Gu [Thu, 21 Apr 2016 21:50:26 +0000 (14:50 -0700)]
leanback: Fix link to changed API setTitle()
To match ag/952395.
Change-Id: I96cf9caa34bd560f14f7864201f3ac228cd2537d
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: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: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: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
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
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
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: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: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
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
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
Julia Reynolds [Thu, 21 Apr 2016 20:18:27 +0000 (20:18 +0000)]
Merge "Announce when volume controls appear and disappear." into nyc-dev
Jason Monk [Thu, 21 Apr 2016 20:14:27 +0000 (16:14 -0400)]
QS: Use current tile state when removing custom tiles
Change-Id: If12415c051239348261386fb23e88d6725767ba0
Fixes:
27912532
Sid Soundararajan [Thu, 21 Apr 2016 20:06:29 +0000 (20:06 +0000)]
Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
Mihai Nita [Thu, 21 Apr 2016 20:01:14 +0000 (20:01 +0000)]
Merge "Framework: change the TTS text to use the current locale" into nyc-dev
am:
344bd5c63d
* commit '
344bd5c63dfbe9a6aaef68144d04d3613563c080':
Framework: change the TTS text to use the current locale
Change-Id: I1c6148c1cbcd25e20bb75d4084d6d81420da0d48
Robert Carr [Thu, 21 Apr 2016 20:01:13 +0000 (20:01 +0000)]
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
am:
37696cccd8
* commit '
37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
Respect manually set HARDWARE_ACCELERATED flag.
Change-Id: I28ae79e505d0a234c293efd56d2434dd6cca0ca8
Chong Zhang [Thu, 21 Apr 2016 19:57:55 +0000 (12:57 -0700)]
Make sure don't adjust IME when docked left-right
bug:
28295645
Change-Id: Ia8f7f9a92fcc562bd672abae4d3ddfd6e6201a79
Mihai Niță [Thu, 21 Apr 2016 19:55:41 +0000 (19:55 +0000)]
Merge "Framework: change the TTS text to use the current locale" into nyc-dev
Rob Carr [Thu, 21 Apr 2016 19:52:01 +0000 (19:52 +0000)]
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 19:15:45 +0000 (19:15 +0000)]
Merge "Fix order of operation issue with ResStringPool" into nyc-dev
am:
b53e8a7a8a
* commit '
b53e8a7a8aa495289ab2872032f80501edd472ef':
Fix order of operation issue with ResStringPool
Change-Id: I6e78bfc1a3b3c61a03e51fca05dc94bd64b76560
Adam Lesinski [Thu, 21 Apr 2016 19:08:38 +0000 (19:08 +0000)]
Merge "Fix order of operation issue with ResStringPool" into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 18:58:52 +0000 (14:58 -0400)]
Announce when volume controls appear and disappear.
Bug:
28120156
Change-Id: I4e17b9cf1cd4a442adb7513168c12e3af24c424f
Fyodor Kupolov [Thu, 21 Apr 2016 18:26:14 +0000 (11:26 -0700)]
Remove pre-N db after successful migration
Bug:
26279712
Change-Id: I53e4bd1b04b4ae6b94e8b5642d7f11a4edd6f1e4
Eric Laurent [Thu, 21 Apr 2016 18:26:19 +0000 (18:26 +0000)]
Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am:
dc7ce84095
* commit '
dc7ce840950398518cc116924b173eb7b7f3288a':
AudioManager: fix isBluetoothA2dpOn()
Change-Id: I7df2a9258ef34716a9a34a47bc501619c3d9ead3
Eric Laurent [Thu, 21 Apr 2016 18:22:57 +0000 (18:22 +0000)]
Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
Sid Soundararajan [Thu, 21 Apr 2016 18:20:52 +0000 (11:20 -0700)]
Make Dismiss Icon under Cards show up only when focused.
BUG:
28299529
Change-Id: I37cd029734da5de8416705746457151c22f64280
Chong Zhang [Thu, 21 Apr 2016 18:14:59 +0000 (18:14 +0000)]
Merge "Fix dead surface/window left on screen" into nyc-dev
am:
289395b1fe
* commit '
289395b1feca65fc758384bb2d5c12f1c78500c1':
Fix dead surface/window left on screen
Change-Id: Id35fbc3822975ca16d8134f780f81ad09efdf2b5
Adam Powell [Thu, 21 Apr 2016 18:04:41 +0000 (11:04 -0700)]
Move child FragmentManager shutdown for retained fragments
Some apps out there do some creative things in terms of calling their
own onDetach methods from elsewhere. Perform the child FragmentManager
shutdown for retained fragments in a package-level perform method
instead of in onDetach itself.
Also mark all existing fragment methods with @CallSuper.
Bug
28293847
Change-Id: I343b610f8d427fe5cabd523a78fbf0e6f3b34c57
Chong Zhang [Thu, 21 Apr 2016 17:58:50 +0000 (17:58 +0000)]
Merge "Fix dead surface/window left on screen" into nyc-dev
Daniel Nishi [Thu, 21 Apr 2016 17:39:59 +0000 (17:39 +0000)]
Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
Yohei Yukawa [Thu, 21 Apr 2016 17:16:15 +0000 (17:16 +0000)]
Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
am:
d67a1ca49b
* commit '
d67a1ca49b138056d53490322ffdadef61d95fec':
Accept null subtype in InputMethodSubtypeHandle.
Change-Id: I59093644b6bb6f9b6573f28fb501d28f736f1972
Chris Craik [Thu, 21 Apr 2016 17:16:14 +0000 (17:16 +0000)]
Merge "Fix shadow radius too large for RS" into nyc-dev
am:
924d8227c4
* commit '
924d8227c4c790f05fb90d6140de15fa8abb704b':
Fix shadow radius too large for RS
Change-Id: I165e946b30e47ba711efb23996ec9d08b0043310
Yohei Yukawa [Thu, 21 Apr 2016 17:11:53 +0000 (17:11 +0000)]
Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
Chris Craik [Thu, 21 Apr 2016 17:09:02 +0000 (17:09 +0000)]
Merge "Fix shadow radius too large for RS" into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 17:05:06 +0000 (10:05 -0700)]
Fix order of operation issue with ResStringPool
Due to ! taking precedence over bitwise &, the condition for
checking non-null terminated string blocks is incorrect.
Adds parentheses for the correct behavior.
Bug:
28288210
Change-Id: Ie31fa239e5f869e6bb28deb6ae190f41f1aa4d92
Jaewan Kim [Thu, 21 Apr 2016 16:31:42 +0000 (16:31 +0000)]
Merge "PIP: Fix system UI crash" into nyc-dev
am:
28d9c9f7b2
* commit '
28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash
Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7
Youngsang Cho [Thu, 21 Apr 2016 16:23:00 +0000 (16:23 +0000)]
Merge "PIP: Fix system UI crash" into nyc-dev
Tony Mak [Thu, 21 Apr 2016 15:56:06 +0000 (15:56 +0000)]
Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am:
d3589ee715
* commit '
d3589ee715e397e61025265adc883c9ed3be4f56':
Fix wrong app is launched after solving challenge from tapping notification
Change-Id: I9de441cca7574620fb3917adddbd911a8a935854
Julia Reynolds [Thu, 21 Apr 2016 15:56:04 +0000 (15:56 +0000)]
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am:
54a6394cf9
* commit '
54a6394cf96423936e6f3548ed8d78ff82e6b247':
Accept the calendar name in addition to the owner as a calendar filter.
Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382
Tony Mak [Thu, 21 Apr 2016 15:51:13 +0000 (15:51 +0000)]
Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
Tony Mak [Thu, 21 Apr 2016 15:43:08 +0000 (16:43 +0100)]
Fix wrong app is launched after solving challenge from tapping notification
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.
Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.
Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix:
28309964
Julia Reynolds [Thu, 21 Apr 2016 15:36:29 +0000 (15:36 +0000)]
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 15:31:47 +0000 (15:31 +0000)]
Merge "Always reevaluate rules when a new service is added." into nyc-dev
am:
a8574a1dfa
* commit '
a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
Always reevaluate rules when a new service is added.
Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780
Keith Cheung [Thu, 21 Apr 2016 15:31:46 +0000 (15:31 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
am:
39066abb59
* commit '
39066abb5929622a1918805bf85d19180c6dfe3d':
Include work app in battery optimization settings
Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82
Julia Reynolds [Thu, 21 Apr 2016 15:24:03 +0000 (15:24 +0000)]
Merge "Always reevaluate rules when a new service is added." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 15:18:12 +0000 (15:18 +0000)]
Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am:
d0f2d1f9ac
* commit '
d0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
Don't call into audiomanager holding a zen lock.
Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884
OSDN Git Service
