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
Jason Monk
08305d711d Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev 
am: 7e10e630b4

* commit '7e10e630b4df10b9ce92953e98dec9d2cda1bfa2':
  QS API: Handle return value from bindServiceAsUser

Change-Id: I40048d7a00969f63cbd8bc969417506a8afaa6f6
 2016-05-25 17:21:32 +00:00
Jason Monk
45ddf4891f Merge "QS: Fix QS touch breaking" into nyc-dev 
am: 8fd8a4fde8

* commit '8fd8a4fde8356bf2d3eb2dda4b6d91e61e80c0c6':
  QS: Fix QS touch breaking

Change-Id: I741f1b1a2eedc734ce3e182b50f6cf17536ab0d8
 2016-05-25 17:21:17 +00:00
Jason Monk
9ed92d72c6 Merge "QS Edit: Fix up accessibility" into nyc-dev 
am: c4b6e2a184

* commit 'c4b6e2a1849690a7f8dfa3be75ee84f1453f8224':
  QS Edit: Fix up accessibility

Change-Id: Id83e89c55111b47de3fd641056d06db77c9b9006
 2016-05-25 17:21:06 +00:00
Jason Monk
c032a33222 Merge "QS Edit: Hide black bar in landscape" into nyc-dev 
am: 630436c9ed

* commit '630436c9ed893b38059e4c9a6e03a753a2e84d3a':
  QS Edit: Hide black bar in landscape

Change-Id: Ic654e69808240b9399a1fdbbf6d224c545c394ac
 2016-05-25 17:20:46 +00:00
Jason Monk
ed90fcae3c Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev 
am: 7e10e630b4

* commit '7e10e630b4df10b9ce92953e98dec9d2cda1bfa2':
  QS API: Handle return value from bindServiceAsUser

Change-Id: Iccb272c0a790ebd39de0a7e15bce3cb7d577f183
 2016-05-25 17:20:02 +00:00
Jason Monk
2d202facb4 Merge "QS: Fix QS touch breaking" into nyc-dev 
am: 8fd8a4fde8

* commit '8fd8a4fde8356bf2d3eb2dda4b6d91e61e80c0c6':
  QS: Fix QS touch breaking

Change-Id: I08825383c49ea25af2af6060bc4831dcb32b133e
 2016-05-25 17:19:51 +00:00
Alan Viverette
7ac0f32c16 Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87 
Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
 2016-05-25 13:16:08 -04:00
Julia Reynolds
39c013811e Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: I52055d3a5193bed6392327bd5df82dc7880c5ce7
 2016-05-25 17:16:01 +00:00
Julia Reynolds
5bf51f026c Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
 2016-05-25 17:15:07 +00:00
Jason Monk
c4b6e2a184 Merge "QS Edit: Fix up accessibility" into nyc-dev 2016-05-25 17:11:31 +00:00
Jason Monk
630436c9ed Merge "QS Edit: Hide black bar in landscape" into nyc-dev 2016-05-25 17:11:23 +00:00
Jason Monk
7e10e630b4 Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev 2016-05-25 17:11:15 +00:00
Jason Monk
8fd8a4fde8 Merge "QS: Fix QS touch breaking" into nyc-dev 2016-05-25 17:11:08 +00:00
Julia Reynolds
d3827be162 Merge changes from topic 'cps' into nyc-dev 
* changes:
  Api updates.
  Note timezone changes.
 2016-05-25 17:09:26 +00:00
Julia Reynolds
ad41a6f0de Api updates. 
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
 2016-05-25 13:02:50 -04:00
Julia Reynolds
83eec7037b Note timezone changes. 
Bug: 28945282
Change-Id: I62fc62e359435f19fecd7e52b2fe778475c5804c
 2016-05-25 13:02:39 -04:00
John Reck
d1b40a5f04 Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 
am: c57a36a634

* commit 'c57a36a634106603161d3840b0af504c5be807bc':

Change-Id: Ie0f16346a3f2dbeeadfe810356d2b8a1d2d1946c
 2016-05-25 16:55:14 +00:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick 
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
 2016-05-25 09:52:51 -07:00
Android Build Merger (Role)
ebe36fb4f7 Merge "Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 am: e5a3df612a" into nyc-mr1-dev-plus-aosp 2016-05-25 16:52:31 +00:00
Android Build Merger (Role)
c9187dd4f7 Merge "Merge "Workaround to display menus for AppCompat themes" into nyc-dev am: 36cd747bb6 am: 6cc7426439" into nyc-mr1-dev-plus-aosp 2016-05-25 16:52:20 +00:00
John Reck
55c65e0821 Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 
am: e5a3df612a

* commit 'e5a3df612adb24dbf89ddde96a75f75ff5ffd380':
  Fix a translate issue with saveLayer

Change-Id: Id3051e9bf217d3d24d2662bde0f7a1863efa8c59
 2016-05-25 16:51:46 +00:00
Diego Perez
a40b4c4ed3 Merge "Workaround to display menus for AppCompat themes" into nyc-dev am: 36cd747bb6 
am: 6cc7426439

* commit '6cc742643967796622c0747311ab3b204a39393a':
  Workaround to display menus for AppCompat themes

Change-Id: I92ba5b7cf04414b173a20385861792924a7ce50f
 2016-05-25 16:51:42 +00:00
Alan Viverette
5e2de2eb12 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c 
am: 9bb16a480d

* commit '9bb16a480d00d8016f9c1969e136acfecceb802b':
  Workaround to display menus for AppCompat themes

Change-Id: I6fee3d4348e763f1e590b6e49740f3108b702b4e
 2016-05-25 16:51:19 +00:00
Chris Banes
ec39b57e6f Fix text appearances not working in colored button styles 
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.

BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
 2016-05-25 16:49:43 +00:00
John Reck
c57a36a634 Merge "Fix a translate issue with saveLayer" into nyc-dev 
am: f4ae997719

* commit 'f4ae9977190d4d406ec5e2aaddb78ea84873f1f0':
  Fix a translate issue with saveLayer

Change-Id: I5ae92450069533898880ab728532657da1dbc399
 2016-05-25 16:47:51 +00:00
Diego Perez
9bb16a480d Merge "Workaround to display menus for AppCompat themes" into nyc-dev 
am: 36cd747bb6

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

Change-Id: I5af2f38a8c470c5aca89e91b951c45f7ae91ed3b
 2016-05-25 16:47:47 +00:00
Android Build Merger (Role)
2753194ca8 Merge "Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: ffa81d0440" into nyc-mr1-dev-plus-aosp 2016-05-25 16:47:42 +00:00
John Reck
e5a3df612a Merge "Fix a translate issue with saveLayer" into nyc-dev 
am: f4ae997719

* commit 'f4ae9977190d4d406ec5e2aaddb78ea84873f1f0':
  Fix a translate issue with saveLayer

Change-Id: Iddc404524b2d1af296519fcf0b426d97c89f191c
 2016-05-25 16:47:17 +00:00
Alan Viverette
4615fefa40 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c 
am: ffa81d0440

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

Change-Id: I2f40f390324f46849e35a114760ed8a4542a87c6
 2016-05-25 16:47:16 +00:00
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
Jiaquan He
a349f8ce7a Merge "Add support for android.R.attr#onTopLauncher" 2016-05-25 16:12:43 +00:00
Kenny Guy
8c78161e0f Merge "Merge "Update suspended to disabled." into nyc-dev am: 646a817caf am: d43f82c241" into nyc-mr1-dev-plus-aosp 
am: 87cc03214b

* commit '87cc03214be52f5893eecdf466c372d65cefc233':

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

* commit 'f9e226247780885688c1934e2f5527da3818cfb8':
  Update suspended to disabled.

Change-Id: Id04b336c83da9147d717c4c1da65cc067487d42e
 2016-05-25 16:04:50 +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