Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Perez
6cc7426439 Merge "Workaround to display menus for AppCompat themes" into nyc-dev 
am: 36cd747bb6

* commit '36cd747bb6030c9c19dbab6bdfd85b2106017973':
  Workaround to display menus for AppCompat themes

Change-Id: I65ce3798aa3fc2d851126d88b3dc1834d05b5393
 2016-05-25 16:47:14 +00:00
Alan Viverette
75dfc87e5e Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c 
am: b9878f0c5a

* commit 'b9878f0c5aab4b540180fb7e36a8e0b41b5e50c2':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I6c9f2c9208cb46ccb4e83f196dfa8ff8ae5ec710
 2016-05-25 16:46:59 +00:00
Roshan Pius
2078d3499b BatteryStats: Allow for sample errors in wlan stats 
Add some leeway in the reported time because some inaccuracy
is expected in these stats between samples.

BUG: 28932100
Change-Id: Ia643fa666ca16c0c707d189ec2bc703fe1ef08a4
 2016-05-25 09:41:31 -07:00
Alan Viverette
3fb5c7b8fa Fix DatePicker.setMin/MaxDate() 
Previously it would only allow year changes, which... doesn't make sense.

Bug: 28953902
Change-Id: I9b15b96662d9d496e11fb426ff23f14b26e90800
 2016-05-25 12:34:55 -04:00
Jason Monk
d075b21a85 QS: Fix QS touch breaking 
Seems not all of the QS container logic was inside the inflate
callback.

Change-Id: I78a8b40d1c181f5dac7127a5b5d20d45ae0f333e
Fixes: 28177371
 2016-05-25 12:30:51 -04:00
John Reck
f4ae997719 Merge "Fix a translate issue with saveLayer" into nyc-dev 2016-05-25 16:27:31 +00:00
Alan Viverette
ffa81d0440 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev 
am: cfbca5640c

* commit 'cfbca5640ca435e1b501254c9cf8b66746799d7e':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I2db34c1d97d289ccbc2498a5084486aa726e6dcb
 2016-05-25 16:24:57 +00:00
Alan Viverette
b9878f0c5a Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev 
am: cfbca5640c

* commit 'cfbca5640ca435e1b501254c9cf8b66746799d7e':
  Use ICU's Calendar class in date picker & related classes

Change-Id: Ideb570415bab784778bb12709d04a37ad3c29275
 2016-05-25 16:24:51 +00:00
Diego Perez
36cd747bb6 Merge "Workaround to display menus for AppCompat themes" into nyc-dev 2016-05-25 16:23:56 +00:00
Alan Viverette
cfbca5640c Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev 2016-05-25 16:20:16 +00:00
Android Build Merger (Role)
87cc03214b Merge "Merge "Update suspended to disabled." into nyc-dev am: 646a817caf am: d43f82c241" into nyc-mr1-dev-plus-aosp 2016-05-25 16:01:25 +00:00
Kenny Guy
10302d1add Merge "Update suspended to disabled." into nyc-dev am: 646a817caf 
am: d43f82c241

* commit 'd43f82c241f265ca2834b779b5ecb7f90d3da41e':
  Update suspended to disabled.

Change-Id: I1bf146e886dbb7c0fe4398d78f446f8d5b389c44
 2016-05-25 16:00:57 +00:00
Kenny Guy
f9e2262477 Merge "Update suspended to disabled." into nyc-dev am: 646a817caf 
am: 7c127bbaf1

* commit '7c127bbaf15aa26188c0b708aaecddc186a564ee':
  Update suspended to disabled.

Change-Id: Ide218ddbf990d25beff5e24d9ca8b3db52e2f246
 2016-05-25 16:00:55 +00:00
Kenny Guy
7c127bbaf1 Merge "Update suspended to disabled." into nyc-dev 
am: 646a817caf

* commit '646a817caff4875462c15128f2e8c5d5c83629b3':
  Update suspended to disabled.

Change-Id: I094736609247a7916ac0aa5dc85c448a3b4b3970
 2016-05-25 15:57:56 +00:00
Kenny Guy
d43f82c241 Merge "Update suspended to disabled." into nyc-dev 
am: 646a817caf

* commit '646a817caff4875462c15128f2e8c5d5c83629b3':
  Update suspended to disabled.

Change-Id: If0d081d5f5ebe3655b972baa4360ccc7dbfeb121
 2016-05-25 15:57:55 +00:00
Kenny Guy
646a817caf Merge "Update suspended to disabled." into nyc-dev 2016-05-25 15:49:52 +00:00
Alan Viverette
68763be41c Use ICU's Calendar class in date picker & related classes 
Also organizes imports.

Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
 2016-05-25 11:42:42 -04:00
Jason Monk
6d21e0d8d2 QS API: Handle return value from bindServiceAsUser 
To avoid crashes better.

Change-Id: I72e74729fbc0b1400c21e1ebc165b565ecd13fba
Fixes: 28721139
 2016-05-25 11:37:47 -04:00
Jason Monk
931f5464f5 QS Edit: Hide black bar in landscape 
Change-Id: I954e5571c01945b697c6254c168c1830467ff7db
Fixes: 28924803
 2016-05-25 11:19:04 -04: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
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
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
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
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
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