Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,385 Commits 3 Branches 0 Tags
710f829e6ddf32b4e240e28ef6ffbba2349bf573
Commit Graph

7872 Commits

Author SHA1 Message Date
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
Dianne Hackborn
23430bf34c Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev 
am: bf949ce

* commit 'bf949ce8a0f8d0a39bdc069c4bedddc4edef26e2':
  Fix issue #27653326: Sync doesn't work in doze maintenance
 2016-03-19 00:57:50 +00:00
Dianne Hackborn
2fefbcf0d1 Fix issue #27653326: Sync doesn't work in doze maintenance 
Add a (configurable) delay between when we start a maintenance
window until the minimum time we will end it.

Also switch to using the alarm manager callback API.  (Yay!)

Also fix a little printing problem in the alarm manager dump
so we put the package name and not some class hash in the
summary string of an alarm entry.

Change-Id: I4281e5c80bc8b26ebc1fb6f603ec33ec0e379daa
 2016-03-18 16:52:30 -07:00
George Mount
3fbaafa4e1 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev am: 7f1bdd9 
am: 4261a09

* commit '4261a095ad5efce7690d4d1836448d7efc0e6557':
  Add @SafeVarargs for methods using typevar varargs.
 2016-03-18 22:20:29 +00:00
George Mount
4261a095ad Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 
am: 7f1bdd9

* commit '7f1bdd9f9180574c8b6b98cefe3c542b92477295':
  Add @SafeVarargs for methods using typevar varargs.
 2016-03-18 22:17:38 +00:00
George Mount
7f1bdd9f91 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 2016-03-18 22:11:39 +00:00
Jeff Sharkey
4621029922 Merge "Mark more Bundles as being defusable." into nyc-dev am: 620a28b 
am: c012cf2

* commit 'c012cf26869e432adf8461e7134f117d95f239e2':
  Mark more Bundles as being defusable.
 2016-03-18 20:09:53 +00:00
Jeff Sharkey
c012cf2686 Merge "Mark more Bundles as being defusable." into nyc-dev 
am: 620a28b

* commit '620a28bad2b1ddabddf2d78b5a20a762ebc29205':
  Mark more Bundles as being defusable.
 2016-03-18 20:06:07 +00:00
Jeff Sharkey
620a28bad2 Merge "Mark more Bundles as being defusable." into nyc-dev 2016-03-18 19:54:52 +00:00
Jeff Sharkey
a04c7a7c64 Mark more Bundles as being defusable. 
They're destined for the system, so they're okay to look inside.

Bug: 27726127
Change-Id: Ic85c308a8efe6f9b8652952717c72b3c663d328a
 2016-03-18 12:20:39 -06:00
Victor Chang
cd14c0a9da Api change of DPM.setApplicationRestrictionsManagingPackage() 
Throws NameNotFoundException instead of IllegalArgumentException

Can't throw NameNotFoundException directly from DPMS as
aidl doesn't support checked exception

Bug: 27532565
Change-Id: I202721f41057f92ad2dd851d4769ba4502a8f9b3
 2016-03-18 16:44:21 +00:00
Phil Weaver
eb3ce37ba4 Merge "Add intdef for UiAutomation flags." into nyc-dev am: 3b2e22a 
am: 3aeb4c4

* commit '3aeb4c461635e3c6c4187c2e77e7ae4e060c70b6':
  Add intdef for UiAutomation flags.
 2016-03-18 15:17:17 +00:00
Phil Weaver
3aeb4c4616 Merge "Add intdef for UiAutomation flags." into nyc-dev 
am: 3b2e22a

* commit '3b2e22a004f659c2e18faa7f2a6e0aa73ce695f2':
  Add intdef for UiAutomation flags.
 2016-03-18 15:15:02 +00:00