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

256219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Banes
f34dec952e Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f 
am: def151052c

* commit 'def151052c2e48a3f0e8de8dbab65db4e953abeb':
  Fix text appearances not working in colored button styles

Change-Id: I3f47630eaf5bc2893b845ad141087d2a2a7011f5
 2016-05-25 18:20:27 +00:00
Chris Banes
def151052c Merge "Fix text appearances not working in colored button styles" into nyc-dev 
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: I229589acdd58746f4a230643ae025fa4639a7991
 2016-05-25 18:05:52 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Android Build Merger (Role)
b1f52d0b89 Merge "Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 am: b56ea680fc" into nyc-mr1-dev-plus-aosp 2016-05-25 17:53:46 +00:00
Chong Zhang
c97737c85f Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 
am: b56ea680fc

* commit 'b56ea680fc3fa650370b539c229986f21d4ed512':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I7860d2c6c4862dfbac060c76e74ca371435906e2
 2016-05-25 17:53:20 +00:00
Chong Zhang
29f0dc25d2 Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 
am: 51cc0f48d7

* commit '51cc0f48d7730efacaee77b8479aeec81cff2d17':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I14fad31b6a9a4947e29d6fbe10c15e5122b95f1c
 2016-05-25 17:53:14 +00:00
Chong Zhang
51cc0f48d7 Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev 
am: 15818e1156

* commit '15818e1156101f1d3a01009e7bc223d8ae88546d':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I96e3ac246e18f1b6cc222ef847275ce15043b441
 2016-05-25 17:42:35 +00:00
Chong Zhang
b56ea680fc Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev 
am: 15818e1156

* commit '15818e1156101f1d3a01009e7bc223d8ae88546d':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I143743940263578e7111ae41eb7b88c005be18a6
 2016-05-25 17:42:33 +00:00
Android Build Merger (Role)
da3bebff8c Merge "Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 am: 36cc784180" into nyc-mr1-dev-plus-aosp 2016-05-25 17:33:12 +00:00
Android Build Merger (Role)
da2534b902 Merge "Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed am: be195ae45f" into nyc-mr1-dev-plus-aosp 2016-05-25 17:33:00 +00:00
Android Build Merger (Role)
7829d4a1bf Merge "Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 am: 08305d711d" into nyc-mr1-dev-plus-aosp 2016-05-25 17:32:41 +00:00
Android Build Merger (Role)
71bd46c92b Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 45ddf4891f" into nyc-mr1-dev-plus-aosp 2016-05-25 17:32:28 +00:00
Chong Zhang
15818e1156 Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev 2016-05-25 17:32:21 +00:00
Jason Monk
e8156cc30c Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 
am: 36cc784180

* commit '36cc78418011fa376a05ac44f25511e34ccf200c':
  QS Edit: Fix up accessibility

Change-Id: I547559a4e22203286b249afa70b98d18a2e68305
 2016-05-25 17:31:31 +00:00
Jason Monk
b64ad56310 Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed 
am: be195ae45f

* commit 'be195ae45f1417ed38d50419e0d6f05d2a14d608':
  QS Edit: Hide black bar in landscape

Change-Id: Ida6200fe3a6bfa45c154b8b0ae382e6ee337988c
 2016-05-25 17:31:16 +00:00
Jason Monk
44196ce297 Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 
am: 08305d711d

* commit '08305d711d626ebe58661b2c5c4dbda593b27cf7':
  QS API: Handle return value from bindServiceAsUser

Change-Id: I21d3343f11940b29a2cf81801514956110b50667
 2016-05-25 17:30:56 +00:00
Jason Monk
fddc464cf4 Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 
am: 45ddf4891f

* commit '45ddf4891f328265b2b64a1e2fade5e443be8a23':
  QS: Fix QS touch breaking

Change-Id: I2b691a0c3b2ce122dbd4a9262d9b26bf5aa3558e
 2016-05-25 17:30:41 +00:00
Jason Monk
25645f1c63 Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 
am: 9ed92d72c6

* commit '9ed92d72c6df6f3c255ca967b416bf5270779afa':
  QS Edit: Fix up accessibility

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

* commit 'c032a332226fb88ff46d225e9ffe627538fb922a':
  QS Edit: Hide black bar in landscape

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

* commit 'ed90fcae3ce426de2796b45a72af03574ad98589':
  QS API: Handle return value from bindServiceAsUser

Change-Id: Id8eb8df8a73f6e9e73a19ee85da40aa594da8209
 2016-05-25 17:30:12 +00:00
Jason Monk
9f3eecb2e1 Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 
am: 2d202facb4

* commit '2d202facb4ccb7aa56373241ca60ab1be843436f':
  QS: Fix QS touch breaking

Change-Id: Ie9842470a766d0fdd4d4672ad597f66348895f00
 2016-05-25 17:30:05 +00:00
Android Build Merger (Role)
d6801ac612 Merge "Merge changes from topic \'cps\' into nyc-dev am: d3827be162 am: 39c013811e" into nyc-mr1-dev-plus-aosp 2016-05-25 17:23:40 +00:00
Julia Reynolds
5b13dcb43f Merge changes from topic \'cps\' into nyc-dev am: d3827be162 
am: 39c013811e

* commit '39c013811e994b8b7e037e2f2c1cfbafd8728aee':
  Api updates.
  Note timezone changes.

Change-Id: Ic0b560085b9a871daa2b0670fdc99ff78c878852
 2016-05-25 17:22:55 +00:00
Julia Reynolds
88be37e50a Merge changes from topic \'cps\' into nyc-dev am: d3827be162 
am: 5bf51f026c

* commit '5bf51f026cddca00b156f93089cb803e4c612d96':
  Api updates.
  Note timezone changes.

Change-Id: Ic175b68e0c8000c1fe613f0e213631d7e1275f2d
 2016-05-25 17:21:58 +00:00
Jason Monk
36cc784180 Merge "QS Edit: Fix up accessibility" into nyc-dev 
am: c4b6e2a184

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

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

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

Change-Id: I1691d9911b646f93c1fecab0cdb03506b4c357cb
 2016-05-25 17:21:44 +00:00
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
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
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