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

148610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
d255aba093 Merge "Add better error message for AAPT file conflicts" into lmp-dev 2014-08-21 22:00:25 +00:00
Adam Lesinski
628f670a54 Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev 2014-08-21 22:00:09 +00:00
Stephen Hines
b020563811 Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev 2014-08-21 21:48:18 +00:00
John Spurlock
7a605e821c QS: Repoint Wifi + BT dual tile labels to settings. 
Bug:17179601
Change-Id: I7854ac04be60ff2dedb29d451e98b6c0d9cce46e
 2014-08-21 17:37:54 -04:00
Dianne Hackborn
0104503c50 Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev 2014-08-21 21:34:09 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Eino-Ville Talvala
edecaee1f2 Camera2: Fix return type of CaptureFailure#getFrameNumber 
Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
 2014-08-21 14:28:50 -07: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
56a9ed858c Merge "Change the NetworkInfo for disconnected types." into lmp-dev 2014-08-21 21:02:19 +00:00
Adam Lesinski
27f69f4e06 AAPT: mipmaps should not end up in Splits 
Mipmaps are never filtered, and so they will always
end up in the base APK. Make sure they get omitted from
any split.

Change-Id: Id24b082bc9bd2d3f031a58bd0de4d30b4f0de7e0
 2014-08-21 13:59:46 -07:00
Alan Viverette
9468c6a28e Clean up nullable listeners in date and time picker delegates 
Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.

BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7
 2014-08-21 13:56:54 -07:00
Adam Lesinski
48f05d29f3 Add better error message for AAPT file conflicts 
Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.

Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612
 2014-08-21 20:54:01 +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
Dianne Hackborn
b1a8a89697 Work on issue #16683269: system_server still leaking memory 
Fix a small temporary leak of app crash dialogs, which weren't
removing their timeout message.

Change-Id: Iee90b5fa2be700e3006388f32145ce4b14baa2ec
 2014-08-21 13:44:19 -07:00
Ronghua Wu
5b9305fe9b MediaHTTPConnection: handles cross protocol redirects. 
Bug: 16899444
Bug: 17106630

Change-Id: I7e416447abffcae31c65fd469ee5f9fc867b4cdc
 2014-08-21 13:42:00 -07:00
Adam Lesinski
bfecd904bf Merge "Update Split example with application icon" into lmp-dev 2014-08-21 20:39:27 +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
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
John Spurlock
e15452bb49 Doze: Improve icon treatment when dozing. 
Instead of inverting them, simply desaturate.  Also, apply
a constant background to small icons and give them some
transparency.

Bug:17137319

Change-Id: Id772b4fcd9ffa461bec26b87a74302012fb27867
 2014-08-21 16:06:11 -04: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
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
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
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
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
Adrian Roos
bed6e3bedc Always put current user first in user switchers 
Bug: 16896343
Change-Id: I2de19b3af5d5b2eed1347b41bccf9c9dc87c2e5b
 2014-08-21 20:31:41 +02:00
Svet Ganov
caab40dfef Merge "Fix a regression in partially updading app widgets." into lmp-dev 2014-08-21 18:27:11 +00:00
John Reck
9eb9f6f8cb Don't run animators in buildLayer 
Bug: 17172689

Change-Id: Ib47d589c002543327fa336718440f9f8c95524e0
 2014-08-21 11:23:05 -07:00
Adam Lesinski
ceb334272f Merge "Use the correct versionCode for Split APKs" into lmp-dev 2014-08-21 18:21:20 +00:00
Adam Lesinski
6a7d2757a9 Use the correct versionCode for Split APKs 
Insert the correct versionCode into the generated
Split AndroidManifest.xml.

Change-Id: I0aec797b5a4ff8bd70f9394b18aee5ad292b37c8
 2014-08-21 11:00:09 -07:00
Andre Eisenbach
491cb3f578 Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 2014-08-21 17:56:25 +00:00
Alan Viverette
125bab40ba Update material switch styling 
Also adds switch style to default theme.

BUG: 16984766
Change-Id: Ib90bcd80cd599e3c66a08ae7b327a347f4ca2405
 2014-08-21 10:54:14 -07:00