Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,941 Commits 3 Branches 0 Tags
fa29d8c368c9958e577db7487fd121f456ddee41
Commit Graph

263941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
fa29d8c368 Merge "Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 am: e5a3df612a" into nyc-mr1-dev-plus-aosp 
am: ebe36fb4f7

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

Change-Id: I061f21b1e2ab6764394e9e95d2f2757bb84f6268
 2016-05-25 17:32:58 +00:00
Diego Perez
2add88a017 Merge "Merge "Workaround to display menus for AppCompat themes" into nyc-dev am: 36cd747bb6 am: 6cc7426439" into nyc-mr1-dev-plus-aosp 
am: c9187dd4f7

* commit 'c9187dd4f7e96e9e5128648a0fb3222d26236266':

Change-Id: Id216f31bec21a8e561eef947a0f2768a2b3d3070
 2016-05-25 17:32:47 +00:00
Diego Perez
64b185e49d Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d 
am: 5e2de2eb12

* commit '5e2de2eb1221c9dafd260b42c732417cfc2b074f':
  Workaround to display menus for AppCompat themes

Change-Id: I5042125c7797c7534c0c83d2e7370d7c5f70be94
 2016-05-25 17:32:33 +00:00
Alan Viverette
9eab5b40b5 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 
am: 2753194ca8

* commit '2753194ca89ec9da399b703e49d7455e2ee3639d':

Change-Id: I597c0d693fde1d49c5a45d9eca4d5886350a81f8
 2016-05-25 17:32:04 +00:00
Alan Viverette
7ac0f32c16 Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87 
Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
 2016-05-25 13:16:08 -04: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
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
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
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
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
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
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