Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
0a1e9905c1 Merge "Merge "Update preloaded drawables" into nyc-dev am: ef817a1deb am: cd13c900e6" into nyc-mr1-dev-plus-aosp 
am: bdf67163ac

* commit 'bdf67163aca8569ee82522a8db39880a68918574':

Change-Id: I898144bfa314e876255044a0bcb1dd15140b1392
 2016-05-25 15:21:44 +00:00
Jason Monk
931f5464f5 QS Edit: Hide black bar in landscape 
Change-Id: I954e5571c01945b697c6254c168c1830467ff7db
Fixes: 28924803
 2016-05-25 11:19:04 -04:00
Adam Powell
3e763770f1 Merge "Update preloaded drawables" into nyc-dev am: ef817a1deb am: 01a7baa7a3 
am: e254186bec

* commit 'e254186becbc6a9366703c58b2039c5c298c97f5':
  Update preloaded drawables

Change-Id: Ief533e9da63f9b3659c2bcf8943dcb68adfe573f
 2016-05-25 15:16:07 +00:00
Android Build Merger (Role)
bdf67163ac Merge "Merge "Update preloaded drawables" into nyc-dev am: ef817a1deb am: cd13c900e6" into nyc-mr1-dev-plus-aosp 2016-05-25 15:13:40 +00:00
Adam Powell
fdb20f6695 Merge "Update preloaded drawables" into nyc-dev am: ef817a1deb 
am: cd13c900e6

* commit 'cd13c900e6789f721b6393edf43e13621f68a009':
  Update preloaded drawables

Change-Id: I4563b0a57a80ac11ba471896fca127e7876eb0c9
 2016-05-25 15:13:10 +00:00
Adam Powell
e254186bec Merge "Update preloaded drawables" into nyc-dev am: ef817a1deb 
am: 01a7baa7a3

* commit '01a7baa7a39e86829d1de86e5594483c6342bb33':
  Update preloaded drawables

Change-Id: Ie6f1515a8364294a8f684425233ff705408375df
 2016-05-25 15:13:06 +00:00
Adam Powell
01a7baa7a3 Merge "Update preloaded drawables" into nyc-dev 
am: ef817a1deb

* commit 'ef817a1debbad9aa3de5ff49765b9a9a72fc73a2':
  Update preloaded drawables

Change-Id: I9fd99afb7b18cbe589a0e97558132f1cdf21cb00
 2016-05-25 15:09:50 +00:00
Adam Powell
cd13c900e6 Merge "Update preloaded drawables" into nyc-dev 
am: ef817a1deb

* commit 'ef817a1debbad9aa3de5ff49765b9a9a72fc73a2':
  Update preloaded drawables

Change-Id: Ic0a4a3bc2c375e5e3af837d50a4613ed5ffe7eff
 2016-05-25 15:09:49 +00:00
Adam Powell
ef817a1deb Merge "Update preloaded drawables" into nyc-dev 2016-05-25 14:59:34 +00:00
Jason Monk
ad5db2979b QS Edit: Fix up accessibility 
Change-Id: I13d426d4ae447c7db074bc7165067870bd8cae5d
Fixes: 28913622
 2016-05-25 10:54:43 -04:00
Lajos Molnar
0581ee4971 media: check profile, level and bitrate for isFormatSupported 
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
 2016-05-25 07:44:15 -07:00
Alan Viverette
63e8d8d228 Merge "Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d am: 64432a513c" into nyc-mr1-dev-plus-aosp 
am: 0c0fc1229b

* commit '0c0fc1229b390089869f651a91dd80fb910ba29a':

Change-Id: I887fe94a2c68962da5a4096636843e3446a9cd00
 2016-05-25 14:40:28 +00:00
Alan Viverette
ac70b483cb Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae am: 1abdeafbd9" into nyc-mr1-dev-plus-aosp 
am: ad6a7ba628

* commit 'ad6a7ba628bbf211ca705898f9259076708e414f':

Change-Id: I3f8e68f6d74782c7c63e7c553eb76d781b0ec612
 2016-05-25 14:40:23 +00:00
Alan Viverette
1c1fbf2c44 Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d am: 6b525a2645 
am: c44c760b9c

* commit 'c44c760b9c711eb22d0a937d56def02e57f5fc37':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: If51c75c3b9d5d39dfa8d0ed6c8113ed68ed430ee
 2016-05-25 14:40:15 +00:00
Alan Viverette
7c4f19cf64 Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae am: 83e714bcc9 
am: 3b7d251cb9

* commit '3b7d251cb9249c071d8b2e03bb1f32a681df15b3':
  Default system theme should be DeviceDefault

Change-Id: Ia608c2bc98a30566fa65c87448fa00a6d3cd9a13
 2016-05-25 14:40:05 +00:00
Ricky Wai
7b9eb419e3 Store work lock type even it uses unified lock 
If we are not storing this, LockPatternUtils.isSecure(workUserId)
will return false, and cause some methods like trySetQuietModeDisabled()
cannot show screen lock correctly.

Bug: 28738725
Change-Id: I7d0b61022b0afff2dac4cdae72d558118ea892e7
 2016-05-25 15:38:34 +01:00
Android Build Merger (Role)
0c0fc1229b Merge "Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d am: 64432a513c" into nyc-mr1-dev-plus-aosp 2016-05-25 14:34:55 +00:00
Android Build Merger (Role)
ad6a7ba628 Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae am: 1abdeafbd9" into nyc-mr1-dev-plus-aosp 2016-05-25 14:34:44 +00:00
Alan Viverette
49e0b395fe Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d 
am: 64432a513c

* commit '64432a513c7090d498daf3ce5d4daf2e6f1aa740':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I09ad57a573d8e6e5dfc23bb6794af3755a66fac3
 2016-05-25 14:34:08 +00:00
Alan Viverette
79a34d4ceb Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae 
am: 1abdeafbd9

* commit '1abdeafbd9630b6cce031c7b89af45c28198a3f3':
  Default system theme should be DeviceDefault

Change-Id: I022f07be53c24545135a3a500d1e14055bfce50c
 2016-05-25 14:34:03 +00:00
Alan Viverette
c44c760b9c Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d 
am: 6b525a2645

* commit '6b525a2645cfe3bf0003f155d86e270dbb6d622c':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I2f6c0340ff015daefad2476bc107b2c862842033
 2016-05-25 14:34:00 +00:00
Alan Viverette
3b7d251cb9 Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae 
am: 83e714bcc9

* commit '83e714bcc9a72d7f74fbee76065e68cd3e93f882':
  Default system theme should be DeviceDefault

Change-Id: I9aba0cd74d6cde865489b6204ba2313ade5b6881
 2016-05-25 14:33:57 +00:00
Alan Viverette
6b525a2645 Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev 
am: 5c9444216d

* commit '5c9444216d187ec2126fdd200e499a1fb3f6ee62':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I616f9b38e7e8fccfa5d1525a1554865466bc5c54
 2016-05-25 14:28:04 +00:00
Alan Viverette
83e714bcc9 Merge "Default system theme should be DeviceDefault" into nyc-dev 
am: 10ed7de7ae

* commit '10ed7de7ae1ef1ac10b596c688182642acaca674':
  Default system theme should be DeviceDefault

Change-Id: I7cbcecaed22b504ce64c7b279df8f7c1d7bc35e8
 2016-05-25 14:28:01 +00:00
Alan Viverette
64432a513c Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev 
am: 5c9444216d

* commit '5c9444216d187ec2126fdd200e499a1fb3f6ee62':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I7517614a5bc600f85c232779a18bf6fbf1f81068
 2016-05-25 14:27:58 +00:00
Alan Viverette
1abdeafbd9 Merge "Default system theme should be DeviceDefault" into nyc-dev 
am: 10ed7de7ae

* commit '10ed7de7ae1ef1ac10b596c688182642acaca674':
  Default system theme should be DeviceDefault

Change-Id: I0cdadd02499b071168ddcd26c5c1b93d4067fe9d
 2016-05-25 14:27:54 +00:00
Alan Viverette
5c9444216d Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev 2016-05-25 14:19:40 +00:00
Alan Viverette
10ed7de7ae Merge "Default system theme should be DeviceDefault" into nyc-dev 2016-05-25 14:18:28 +00:00
Ricky Wai
d58ffaa8d0 Merge "Hide work profile key in user credentials screen am: d398244513 am: 276f168f10" into nyc-mr1-dev-plus-aosp 
am: 7d13035bcc

* commit '7d13035bcc0ec9f75961b66bbba1b991beb0f063':

Change-Id: I09f52fbe34e5d7b55889bc00685ae7b5dfef061d
 2016-05-25 13:36:20 +00:00
Ricky Wai
71b04e6ac2 Merge "Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: fdf928d4b5" into nyc-mr1-dev-plus-aosp 
am: ba6f173c7c

* commit 'ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57':

Change-Id: I4375084e3c25e6c4e5fbfce20e3bf826b076ec81
 2016-05-25 13:36:10 +00:00
Ricky Wai
7b1ccf8700 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp 
am: b5e2592582

* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
  Hide work profile key in user credentials screen

Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b
 2016-05-25 13:34:55 +00:00
Ricky Wai
9b4a83bf07 Merge "Unlock work profile storage even work mode is off" into nyc-dev am: f420c413b9 am: f518aaaf1f 
am: af36d2a1fd

* commit 'af36d2a1fd81b208c5ead11e71c5934a9ff08596':

Change-Id: I46a1a2486681662ae74795dd7155cfbc9e4b86de
 2016-05-25 13:34:44 +00:00
Android Build Merger (Role)
7d13035bcc Merge "Hide work profile key in user credentials screen am: d398244513 am: 276f168f10" into nyc-mr1-dev-plus-aosp 2016-05-25 13:29:32 +00:00
Android Build Merger (Role)
ba6f173c7c Merge "Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: fdf928d4b5" into nyc-mr1-dev-plus-aosp 2016-05-25 13:29:19 +00:00
Android Build Merger (Role)
b5e2592582 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp 2016-05-25 13:29:15 +00:00
Ricky Wai
750229fdf0 Hide work profile key in user credentials screen am: d398244513 
am: ed39b3b166

* commit 'ed39b3b1666cff34e34c394029fad0ad9e426968':
  Hide work profile key in user credentials screen

Change-Id: I18cefc9f365ed83db5262676a1f4b9cc28b20c07
 2016-05-25 13:27:41 +00:00
Ricky Wai
b581ebee69 Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: 2281b83051 
am: cdb948c81c

* commit 'cdb948c81cdae49a46972bd6ff9acbb02a4a99ce':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I9b1fb2e49954ac7720e10b809d313e599b17dad1
 2016-05-25 13:27:34 +00:00
Ricky Wai
cf90f51734 Hide work profile key in user credentials screen am: d398244513 
am: 276f168f10

* commit '276f168f101f1653ba1a5519913f2bd151a25f01':
  Hide work profile key in user credentials screen

Change-Id: I9df735a720df70dbbcbfd6e36575821f355b2d14
 2016-05-25 13:27:32 +00:00
Ricky Wai
3941399644 Merge "Unlock work profile storage even work mode is off" into nyc-dev am: f420c413b9 am: efc3838caa 
am: 316abe21bd

* commit '316abe21bd2cd53879af969d48c17ff1fbe45bd5':
  Unlock work profile storage even work mode is off

Change-Id: I2c5bf82aef3e130781acf0a25991822c1bb72d9f
 2016-05-25 13:27:28 +00:00
Ricky Wai
bacc1d40ac Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 am: 88986c8887 
am: 454bb8d526

* commit '454bb8d526d998060d56c84b34e7a345ce7fa44d':

Change-Id: I06c6757b85e21dcf1973a317e47d81861b891abc
 2016-05-25 13:27:20 +00:00
Ricky Wai
96c2032090 Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd 
am: fdf928d4b5

* commit 'fdf928d4b5df808030bd0e362860adf84f504184':

Change-Id: I8051cdc277e07e0f47f192af8f4797b37b177a29
 2016-05-25 13:27:18 +00:00
Ricky Wai
af36d2a1fd Merge "Unlock work profile storage even work mode is off" into nyc-dev am: f420c413b9 
am: f518aaaf1f

* commit 'f518aaaf1f1f88a2a4e27cfba6af6f825ccd820b':

Change-Id: I67e3fda4c8743d0c48e1d7d56e21acfba0d046d3
 2016-05-25 13:27:12 +00:00
Ricky Wai
cdb948c81c Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd 
am: 2281b83051

* commit '2281b83051f8f2d14dfc0a366ed54b1716370412':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: Ia43caa8b23eced60a8ef187ed100b106aedb74a3
 2016-05-25 13:23:24 +00:00
Ricky Wai
316abe21bd Merge "Unlock work profile storage even work mode is off" into nyc-dev am: f420c413b9 
am: efc3838caa

* commit 'efc3838caa47b758203420180cc8d2804ecb85b5':
  Unlock work profile storage even work mode is off

Change-Id: I4cd8cc396e78b234ab60f63274fc93e3770e7c52
 2016-05-25 13:23:21 +00:00
Ricky Wai
d41790c16f Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 am: 8d5ab52c6c 
am: e629990e34

* commit 'e629990e348c8afcca49f79dfa900ebcffce0737':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: Ibeaa4225d4653b9d57cbf0a5bbb78d182f57769e
 2016-05-25 13:22:34 +00:00
Ricky Wai
ed39b3b166 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I5273b53b07cb80d45bac61c8dcc5cba8f6b11b3a
 2016-05-25 13:20:51 +00:00
Ricky Wai
276f168f10 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
 2016-05-25 13:18:26 +00:00
Ricky Wai
454bb8d526 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 
am: 88986c8887

* commit '88986c8887a2107480d896359569a8e188bbf083':

Change-Id: I99494f984c753e574ae56d16d84841aa54838098
 2016-05-25 13:18:13 +00:00
Ricky Wai
2281b83051 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
 2016-05-25 13:15:33 +00:00
Ricky Wai
efc3838caa Merge "Unlock work profile storage even work mode is off" into nyc-dev 
am: f420c413b9

* commit 'f420c413b9abd58dcbea881535da5b603f7f7afc':
  Unlock work profile storage even work mode is off

Change-Id: Id0d15aca6b8f8d519910c38e03bf4c82894b8e37
 2016-05-25 13:15:26 +00:00