George Mount
2d5308e196
Merge "Invalidate entire scene root when executing the transition." into nyc-dev am: f189c2f
...
am: 015651f
* commit '015651fa55b9e7ec05d61ef0d233444536d5111a':
Invalidate entire scene root when executing the transition.
2016-03-24 14:52:36 +00:00
George Mount
015651fa55
Merge "Invalidate entire scene root when executing the transition." into nyc-dev
...
am: f189c2f
* commit 'f189c2ffa250d4da27b18263c6876d79610ce6e3':
Invalidate entire scene root when executing the transition.
2016-03-24 14:50:11 +00:00
George Mount
f189c2ffa2
Merge "Invalidate entire scene root when executing the transition." into nyc-dev
2016-03-24 14:45:22 +00:00
Clara Bayarri
cc80281911
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev am: 3e5bf78
...
am: c84e36b
* commit 'c84e36b7ec77e52ab184c1328c55ee71f8ba4aa5':
Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:41:42 +00:00
Clara Bayarri
c84e36b7ec
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
...
am: 3e5bf78
* commit '3e5bf786b7ca36fa0cc150fcd8d0e7a69ecb9db0':
Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:37:26 +00:00
Clara Bayarri
3e5bf786b7
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
2016-03-24 13:30:48 +00:00
Clara Bayarri
fcd7e80b21
Keyboard Shortcuts: plumb deviceId through
...
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Adam Powell
2ce140df85
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev am: 30ac43e
...
am: f26ebfc6
* commit 'f26ebfc6c2ac42ffca127f83615f503276fdc454':
Fix bugs around restoring nested retained instance fragments
2016-03-23 22:45:33 +00:00
Adam Powell
f26ebfc6c2
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
...
am: 30ac43e
* commit '30ac43e4acc4ed5673ea40d6643e36fadec5411c':
Fix bugs around restoring nested retained instance fragments
2016-03-23 22:40:03 +00:00
Adam Powell
30ac43e4ac
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
2016-03-23 22:27:31 +00:00
George Mount
52ff2b7798
Invalidate entire scene root when executing the transition.
...
Bug 27778109
When switching from forced visibility to using real visibility,
I didn't take into account the fact that invalidating INVISIBLE
Views skip invalidation. This CL invalidates the scene root
to ensure that the transition is properly executed.
Change-Id: I092d0fe42229390927f7d1b65fc2b3ce5fc2938d
2016-03-23 14:01:35 -07:00
Adam Powell
eacacb5989
Fix bugs around restoring nested retained instance fragments
...
Framework edition
In a few configurations the child fragment state of a
retained-instance fragment would not be preserved correctly, leading
to child fragments not being restored. Clean this up along with live
state management issues that were leading to logged warnings during
normal fragment operation.
Bug 27371492
Bug 27477824
Change-Id: I847ac05b1757392580e008dc20c50c3ef365ca68
2016-03-23 13:07:27 -07:00
Adrian Roos
710f829e6d
Merge "Ensure notification color contrast" into nyc-dev am: 9b95f61
...
am: e933de8
* commit 'e933de8e769fb78d8af8b965d329ab91bccdbd15':
Ensure notification color contrast
2016-03-23 18:47:54 +00:00
Adrian Roos
e933de8e76
Merge "Ensure notification color contrast" into nyc-dev
...
am: 9b95f61
* commit '9b95f615c45b2dac053aa45d881f6a4b3c301342':
Ensure notification color contrast
2016-03-23 18:44:00 +00:00
Adrian Roos
9b95f615c4
Merge "Ensure notification color contrast" into nyc-dev
2016-03-23 18:14:54 +00:00
Adrian Roos
4ff3b120ff
Ensure notification color contrast
...
Ensure we have at least 3:1 contrast for the
action buttons. Also ensures that the inline
reply box background has 4.5:1 contrast to white.
Further modifies the color of the inline reply
background to satisfy a 4.5:1 contrast ratio for
the entered text.
Bug: 26831312
Change-Id: If42b1c99d1adee547d0a583c1a69c48ef7287c23
2016-03-23 10:49:40 -07:00
Michal Karpinski
9e8ccbe43e
Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev am: 8aa976b
...
am: 4a6a538
* commit '4a6a538df979887ddf96e23d42681340c64014c8':
Remove legacy DeviceLogging methods from DPM
2016-03-23 17:04:29 +00:00
Michal Karpinski
4a6a538df9
Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev
...
am: 8aa976b
* commit '8aa976b60b0b638a77f9007fa6d1a247815d4b09':
Remove legacy DeviceLogging methods from DPM
2016-03-23 17:00:44 +00:00
Michal Karpinski
3bce4bfa04
Remove legacy DeviceLogging methods from DPM
...
Those methods were replaced with SecurityLogging ones.
Bug: 27532425
Change-Id: I6952251d9c15f932517e7cb39a7056f35c3a194f
2016-03-23 13:14:33 +00:00
Paul Stewart
59ff8a11bc
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev am: 68ffbba
...
am: 366f851
* commit '366f851e35019816f278de6307c5aec87bbe569f':
WifiManager: Use ConnectivityThread
Create ConnectivityThread
2016-03-22 22:31:06 +00:00
Paul Stewart
366f851e35
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
...
am: 68ffbba
* commit '68ffbba158579dd8b6f32aa628ec91228786e864':
WifiManager: Use ConnectivityThread
Create ConnectivityThread
2016-03-22 22:27:38 +00:00
Paul Stewart
68ffbba158
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
...
* changes:
WifiManager: Use ConnectivityThread
Create ConnectivityThread
2016-03-22 22:23:48 +00:00
Jeff Sharkey
754c8dfea7
Merge "Throw the right exception flavor." into nyc-dev am: 7067487
...
am: 2a0afa5
* commit '2a0afa58633cf2f7910513575bf67836b62984ff':
Throw the right exception flavor.
2016-03-22 18:45:46 +00:00
Jeff Sharkey
2a0afa5863
Merge "Throw the right exception flavor." into nyc-dev
...
am: 7067487
* commit '706748782173d2f02fbbeda1310e09cd033157a3':
Throw the right exception flavor.
2016-03-22 18:43:01 +00:00
Jeff Sharkey
7067487821
Merge "Throw the right exception flavor." into nyc-dev
2016-03-22 18:39:39 +00:00
Jeff Sharkey
0c2ccd0598
Throw the right exception flavor.
...
Change-Id: Ie017fce925ed0122d3820c3f3d91e1b86982a7b1
2016-03-22 10:05:47 -06:00
Tony Mak
fe5cd89cb9
Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28
...
am: 438b3f2
* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
Revert getUserInfo change and add isManagedPorfile(int userId)
2016-03-22 15:32:58 +00:00
Tony Mak
438b3f218d
Revert getUserInfo change and add isManagedPorfile(int userId)
...
am: 8673b28
* commit '8673b2899e775014336efff44ea88dcac2b25bdd':
Revert getUserInfo change and add isManagedPorfile(int userId)
2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e
Revert getUserInfo change and add isManagedPorfile(int userId)
...
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
2016-03-22 15:26:05 +00:00
Benjamin Franz
f6aeab55c4
Merge "Clean up some javadoc issues" into nyc-dev am: 517a958
...
am: 37c5dff
* commit '37c5dff49de952fbbc7f8ee00d9d0d0399e60fc1':
Clean up some javadoc issues
2016-03-22 11:40:06 +00:00
Benjamin Franz
37c5dff49d
Merge "Clean up some javadoc issues" into nyc-dev
...
am: 517a958
* commit '517a9583a869ed1913efeb003592db184d1a09e0':
Clean up some javadoc issues
2016-03-22 11:37:26 +00:00
Benjamin Franz
517a9583a8
Merge "Clean up some javadoc issues" into nyc-dev
2016-03-22 11:30:47 +00:00
Benjamin Franz
ea95624290
Clean up some javadoc issues
...
Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f
2016-03-22 11:26:48 +00:00
Christopher Tate
f8d09be47e
Merge "Add API to read the current wallpaper\'s ID" into nyc-dev am: c823df1
...
am: 924f6d8
* commit '924f6d87da6ebb75d03760becc99306a1daf5533':
Add API to read the current wallpaper's ID
2016-03-22 00:10:02 +00:00
Christopher Tate
924f6d87da
Merge "Add API to read the current wallpaper\'s ID" into nyc-dev
...
am: c823df1
* commit 'c823df1435b6e660a2ed2f345a28b1f391378f0f':
Add API to read the current wallpaper's ID
2016-03-22 00:07:23 +00:00
Chris Tate
c823df1435
Merge "Add API to read the current wallpaper's ID" into nyc-dev
2016-03-22 00:03:14 +00:00
Christopher Tate
e409f0e462
Add API to read the current wallpaper's ID
...
Also regularize cross-user call handling throughout.
Bug 27743435
Change-Id: Ibc530d0576d657723a613888357a6ea71b482763
2016-03-21 15:32:57 -07:00
Wale Ogunwale
9484c75638
Merge "Added support to specify animation duration when resizing stack" into nyc-dev am: 85941cf
...
am: 99ef1db
* commit '99ef1dbbe9d703ab1f485a759ad1c918293a00c8':
Added support to specify animation duration when resizing stack
2016-03-21 20:13:47 +00:00
Wale Ogunwale
99ef1dbbe9
Merge "Added support to specify animation duration when resizing stack" into nyc-dev
...
am: 85941cf
* commit '85941cff0c65bc023e4ca29c0eac8548c8f61be6':
Added support to specify animation duration when resizing stack
2016-03-21 20:11:03 +00:00
Wale Ogunwale
85941cff0c
Merge "Added support to specify animation duration when resizing stack" into nyc-dev
2016-03-21 20:04:20 +00:00
Wale Ogunwale
e75a9adfbd
Added support to specify animation duration when resizing stack
...
Needed for sys-ui to control the duration of various Pip transitions.
Bug: 27674339
Change-Id: I7bad27aaa19755a73c594e88b88b56db033e1a45
2016-03-21 11:17:19 -07:00
Tony Mak
7ccbbc7940
Merge "Show launcher when profile is locked immediately" into nyc-dev am: 03bdd9f
...
am: 9e634ad
* commit '9e634ad25d09b44eda8651272b54c68480bec6e8':
Show launcher when profile is locked immediately
2016-03-21 14:27:15 +00:00
Tony Mak
9e634ad25d
Merge "Show launcher when profile is locked immediately" into nyc-dev
...
am: 03bdd9f
* commit '03bdd9fa0e79aa7d4da5bc3704c74f575ab1bfa6':
Show launcher when profile is locked immediately
2016-03-21 14:24:50 +00:00
Tony Mak
03bdd9fa0e
Merge "Show launcher when profile is locked immediately" into nyc-dev
2016-03-21 14:20:45 +00:00
Tony Mak
9c6e8ced9b
Show launcher when profile is locked immediately
...
Previously, we show launcher when keyguard is dismissed.
It introduces these issues:
1. There can be no device lock
2. user could take a quick peek of the work app
Current behavior:
1. We now show launcher once the work profile is locked.
2. Lock profile immediately if there is no device lock
3. Add cancel "lockProfileLater" logic
Bug: 27241680
Bug: 27673460
Change-Id: I765aa22d4c8ae5017c1611f5a340a4b33d463b1e
2016-03-21 13:54:32 +00:00
Victor Chang
40240b17c9
Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev am: d3c0cf5
...
am: 6918dbc
* commit '6918dbc87144d273fae62dae7c524993f0cbba7b':
Api change of DPM.setApplicationRestrictionsManagingPackage()
2016-03-21 13:15:12 +00:00
Victor Chang
6918dbc871
Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev
...
am: d3c0cf5
* commit 'd3c0cf50b6c8e71c0c409abcd3b8c32f98f7cb71':
Api change of DPM.setApplicationRestrictionsManagingPackage()
2016-03-21 13:12:47 +00:00
Victor Chang
d3c0cf50b6
Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev
2016-03-21 13:08:14 +00:00
Paul Stewart
bf8cbb05e0
WifiManager: Use ConnectivityThread
...
Instead of minting it's own hander thread, have WifiManager use
the looper from ConnectivityThread.
Bug: 27432949
Change-Id: Iddeebeb8ab506c912f526c7569f304e10b9d7ab8
2016-03-19 10:05:06 -07:00
Dianne Hackborn
2d9b2b98ef
Merge "Fix issue #27653326 : Sync doesn\'t work in doze maintenance" into nyc-dev am: bf949ce
...
am: 23430bf
* commit '23430bf34ce51fd60ba9738913cf2a600384786a':
Fix issue #27653326 : Sync doesn't work in doze maintenance
2016-03-19 01:00:06 +00:00