drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
149,636 Commits 1 Branch 0 Tags
Commit Graph

149636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
7a4a99f0b2 am b7c2ac25: Merge "Don\'t say "Arabic (Egypt)" in Settings." into lmp-dev 
* commit 'b7c2ac254d6e7546fc95ae601298f7df4c619429':
  Don't say "Arabic (Egypt)" in Settings.
 2014-08-21 21:34:47 +00:00
Elliott Hughes
105f6ceb0f Merge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev 2014-08-21 21:24:44 +00:00
Robert Greenwalt
8a8c3ab042 am c540c917: Merge "Change the NetworkInfo for disconnected types." into lmp-dev 
* commit 'c540c9171603070822dd244518b9809248263d4d':
  Change the NetworkInfo for disconnected types.
 2014-08-21 21:13:20 +00:00
Robert Greenwalt
56a9ed858c Merge "Change the NetworkInfo for disconnected types." into lmp-dev 2014-08-21 21:02:19 +00:00
Chris Craik
d22a71761e am c5e5f0a4: Merge "Enable scissor for rounded outline clips" into lmp-dev 
* commit 'c5e5f0a4526bce5c63066e87f89e5890966ea509':
  Enable scissor for rounded outline clips
 2014-08-21 20:55:28 +00:00
Chris Craik
759f780af0 Merge "Enable scissor for rounded outline clips" into lmp-dev 2014-08-21 20:48:53 +00:00
Chris Craik
79d26c72aa Enable scissor for rounded outline clips 
bug:17164074

Change-Id: I83ca428f4d7651c6774ab81ac390477fb90c5d38
 2014-08-21 13:47:08 -07:00
Adam Lesinski
54ff554ed6 am e623df3a: Merge "Update Split example with application icon" into lmp-dev 
* commit 'e623df3ad126bc72bedfb2080f129ee7e90e9336':
  Update Split example with application icon
 2014-08-21 20:43:52 +00:00
Adam Lesinski
837fb15af8 am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit '435afbc522f2055aa211fd827acd56875e28f708':
  Report the right resource version in am get-config
 2014-08-21 20:43:47 +00:00
Matthew Williams
9dec720ec9 am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '7a67b0c9d0b397fadcf0d4feca2ab80e462df48e':
  JobScheduler needs to flush queue on charging
 2014-08-21 20:43:42 +00:00
Adam Lesinski
bfecd904bf Merge "Update Split example with application icon" into lmp-dev 2014-08-21 20:39:27 +00:00
Jason Monk
19310f5c01 am cc300347: Merge "Write device owner name to XML" into lmp-dev 
* commit 'cc3003479741e0ab195a0fbb6cdbbddb0130fffa':
  Write device owner name to XML
 2014-08-21 20:39:20 +00:00
Adam Lesinski
b5136731b2 Merge "Report the right resource version in am get-config" into lmp-dev 2014-08-21 20:39:00 +00:00
Matthew Williams
bafeeb9813 JobScheduler needs to flush queue on charging 
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
 2014-08-21 20:37:06 +00:00
John Reck
330d836266 am 44de04b8: Merge "Don\'t run animators in buildLayer" into lmp-dev 
* commit '44de04b8d4642c62836499fcefe4d431abd4fe2f':
  Don't run animators in buildLayer
 2014-08-21 20:28:45 +00:00
John Reck
6237df8a02 am 25f606a0: Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 
* commit '25f606a063006e7d38e5150b73b511e8d69b563e':
  Fix supporting modifying listeners in callbacks
 2014-08-21 20:28:41 +00:00
Jason Monk
de3af82ce0 Merge "Write device owner name to XML" into lmp-dev 2014-08-21 20:28:10 +00:00
John Reck
7d37344915 Merge "Don't run animators in buildLayer" into lmp-dev 2014-08-21 20:26:18 +00:00
Elliott Hughes
fbc4a34a20 Don't say "Arabic (Egypt)" in Settings. 
Nexus devices only ship one Arabic locale: ar_EG. This should probably be
changed to ar_001 in a later release (and, really, we should let users
choose _all_ of the Arabic-speaking countries), but there's no time for L.

This adds ar_EG to the list of special cases for LocalePicker so that
we'll show "Arabic" instead of "Arabic (Egypt)" (the actual change uses
the Arabic for "Arabic", obviously).

If you're an OEM trying to ship multiple Arabic locales, please accept
my apologies for making your lives slightly harder and, yes, this is the
patch you want to revert so that ar_EG shows up as "Arabic (Egypt)" again.

Bug: 17150708
Change-Id: Iea2fdf813bf3d7758e667bb1a8134a612ee0317b
 2014-08-21 13:23:43 -07:00
John Reck
2b5d920e80 Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 2014-08-21 20:18:56 +00:00
Alan Viverette
d4454a1713 am 8276a657: Merge "Update form spinner and search field assets" into lmp-dev 
* commit '8276a6577c50c3d99a0e5d8ee4ab666f670011b7':
  Update form spinner and search field assets
 2014-08-21 20:08:15 +00:00
Alan Viverette
138e781717 am 52e313c1: Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 
* commit '52e313c14c5cf1d1a71fd491e64849c4b7b62970':
  Jump drawable state (including ripples) on view detach
 2014-08-21 20:08:10 +00:00
Alan Viverette
1b42fd5124 am ce5a9143: Merge "Update material switch styling" into lmp-dev 
* commit 'ce5a91438f3f609368b81930fb0541c7258649c8':
  Update material switch styling
 2014-08-21 20:08:04 +00:00
Alan Viverette
aa45ff70a2 Merge "Update form spinner and search field assets" into lmp-dev 2014-08-21 20:03:05 +00:00
Alan Viverette
04e723c1af Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 2014-08-21 20:03:03 +00:00
Alan Viverette
edf82bd269 Merge "Update material switch styling" into lmp-dev 2014-08-21 19:59:04 +00:00
Alan Viverette
d78a44576c Jump drawable state (including ripples) on view detach 
BUG: 15350931
Change-Id: I09928f59fb7b9f6d87b1f5219353a41ae6b5681d
 2014-08-21 12:57:45 -07:00
Alan Viverette
88eab02a36 Update form spinner and search field assets 
Also cleans up insets in some other Material drawables.

BUG: 17162129
BUG: 16736289
Change-Id: I9b4d77230941522022908bc2939c4026459cf02a
 2014-08-21 12:53:27 -07:00
Jason Monk
4e7a65f15c Write device owner name to XML 
So that it can be remembered.

Bug: 17153003
Change-Id: I6fb96334f235348bc237cc52e09c2fe5ef1332b7
 2014-08-21 15:50:48 -04:00
Riley Andrews
40b44120d5 am 61df2efa: Merge "Use the crop function in the surfaceflinger screenshot api." into lmp-dev 
* commit '61df2efa19e075646f47bd4c124e0bd42539ee50':
  Use the crop function in the surfaceflinger screenshot api.
 2014-08-21 19:38:59 +00:00
John Reck
3b27e59e1e Fix supporting modifying listeners in callbacks 
Bug: 17179442

Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821
 2014-08-21 12:37:48 -07:00
Riley Andrews
5c270bf41c Merge "Use the crop function in the surfaceflinger screenshot api." into lmp-dev 2014-08-21 19:31:45 +00:00
Adam Lesinski
269d2d4f69 Update Split example with application icon 
Play console wants the icon in the <application> tag

Change-Id: I83f8e5488ad853e548ba7aba6e32b14602a24ad3
 2014-08-21 12:23:36 -07:00
Adam Lesinski
ebc3e4cbf1 Report the right resource version in am get-config 
Change-Id: I79ed3db45d91d8ec7e6f67608533ce3adf22ab27
 2014-08-21 12:21:45 -07:00
John Spurlock
8d7ec6aa0f am 44876391: Merge "Implement GradientDrawable getColorFilter." into lmp-dev 
* commit '448763911c17190e9b7e968340369aab9bd693b7':
  Implement GradientDrawable getColorFilter.
 2014-08-21 19:16:10 +00:00
Jason Monk
c7f9c059df am ee3266fd: Merge "Show lock to app request on all users" into lmp-dev 
* commit 'ee3266fd09b6ba69c14e4804c38895a166720bcd':
  Show lock to app request on all users
 2014-08-21 19:16:06 +00:00
Chris Craik
8f3acc3d93 am e5b5ad25: Merge "Fix layer shadow transform crash" into lmp-dev 
* commit 'e5b5ad251d56c66f28ab9333e9019bdc8cfc88e1':
  Fix layer shadow transform crash
 2014-08-21 19:15:57 +00:00
John Spurlock
0df011725c Merge "Implement GradientDrawable getColorFilter." into lmp-dev 2014-08-21 19:13:58 +00:00
Jason Monk
1889c5c36d Merge "Show lock to app request on all users" into lmp-dev 2014-08-21 19:13:32 +00:00
Chris Craik
88180d269e Merge "Fix layer shadow transform crash" into lmp-dev 2014-08-21 19:03:25 +00:00
Nicolas Prevot
ae7a8453f4 am 38f817d8: Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev 
* commit '38f817d8c5e3fd104988eec60453113a6b31ee03':
  In startActivityAsCaller, changing the way we get the userId.
 2014-08-21 18:53:26 +00:00
RoboErik
7247f17e20 am 36f8f711: Merge "Always set transport control flags" into lmp-dev 
* commit '36f8f711a494d88c2b649632861ce5d55e0ea8b8':
  Always set transport control flags
 2014-08-21 18:53:22 +00:00
Adam Lesinski
8207304c48 am 187df3fa: Merge "Update the Split example" into lmp-dev 
* commit '187df3fa17d3e39c1ef581733717ee45adf52c37':
  Update the Split example
 2014-08-21 18:53:16 +00:00
John Spurlock
38b5f597de Implement GradientDrawable getColorFilter. 
Otherwise the value in setColorFilter is unavailable.

Bug:17137319
Change-Id: Ief973abfa129d935aa45336275337e19a3eb0f6a
 2014-08-21 14:53:05 -04:00
Nicolas Prevot
fffe00dfda Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev 2014-08-21 18:47:38 +00:00
Adrian Roos
62919ef1cc am 7db2d800: Merge "Always put current user first in user switchers" into lmp-dev 
* commit '7db2d80046a8f5544d9c2e82a9ed534bae56ad49':
  Always put current user first in user switchers
 2014-08-21 18:45:44 +00:00
RoboErik
7a346dfdd7 Merge "Always set transport control flags" into lmp-dev 2014-08-21 18:44:26 +00:00
Adam Lesinski
f01c2149a0 Merge "Update the Split example" into lmp-dev 2014-08-21 18:43:58 +00:00
Adam Lesinski
49e2fa5c5e Update the Split example 
Caveat: There are two bugs:

- Mipmap definitions get placed in all splits.
- mdpi drawable doesn't get split properly.

Change-Id: I53b8e54cbcb3dfba495ec68e602f98666e8883a7
 2014-08-21 11:38:49 -07:00
Adrian Roos
aa6e09e7c7 Merge "Always put current user first in user switchers" into lmp-dev 2014-08-21 18:36:03 +00:00