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

114885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
4053ba80c6 am 79fbed08: Doc change: adjust element spacing. 
* commit '79fbed08bd8bcf8c44adfc0a8306b77af2213585':
  Doc change: adjust element spacing.
 2013-11-07 05:19:05 +00:00
Dirk Dougherty
c7563499ae resolved conflicts for merge of ad209a93 to klp-ub-dev 
Change-Id: Ib474819c1100b75de65915986213c4c14d017100
 2013-11-06 20:53:44 -08:00
Baligh Uddin
89dcc8a116 am 41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '41c2f04e2a7f48c88f59e91d4b2b130dbfb2fce5':
  Import translations. DO NOT MERGE
 2013-11-06 20:00:17 -08:00
Baligh Uddin
6695fa5299 am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5be3186bac66fa08ad3ee86537492ada9e822879':
  Import translations. DO NOT MERGE
 2013-11-06 20:00:13 -08:00
Baligh Uddin
41c2f04e2a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 03:55:33 +00:00
Baligh Uddin
5be3186bac Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 03:55:19 +00:00
Jim Miller
b8aba3f4df am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev 
* commit 'b892ac680b045daca2926037955857889d32e1c0':
  Fix glitch with switching users from QuickSettings
 2013-11-06 19:16:59 -08:00
Jim Miller
b892ac680b Merge "Fix glitch with switching users from QuickSettings" into klp-dev 2013-11-07 03:14:37 +00:00
Christopher Tate
aa719e92ff am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev 
* commit 'c157cac9b2827a4eeb0ea29209fbb879a6076de4':
  System package permission decls take precedence over 3rd party apps'
 2013-11-06 16:57:01 -08:00
Christopher Tate
c157cac9b2 Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev 2013-11-07 00:54:55 +00:00
Adam Powell
b3651b6fc3 am 2942053c: Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev 
* commit '2942053c25b577f4ecdd431072cc438b16d2778b':
  Merge toast frame assets, update themes, etc. accordingly
 2013-11-06 16:05:23 -08:00
Adam Powell
2942053c25 Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev 2013-11-07 00:01:09 +00:00
Dirk Dougherty
1ae704b87e resolved conflicts for merge of b08447ba to klp-ub-dev 
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
 2013-11-06 15:42:01 -08:00
Chris Craik
baba771c85 am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 
* commit '47742d4bb004a51c045d443024a36d784cd38d9b':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
 2013-11-06 15:26:51 -08:00
Ruben Brunk
9aed2ae0bd am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev 
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
  Disable face unlock when returning from camera.
 2013-11-06 15:26:48 -08:00
Craig Mautner
ea18624ae5 am c9d0ee5e: Merge "Tweak test for layout." into klp-dev 
* commit 'c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952':
  Tweak test for layout.
 2013-11-06 15:26:45 -08:00
Chris Craik
47742d4bb0 Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 2013-11-06 23:23:56 +00:00
Craig Mautner
8ed10cff78 am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 
* commit 'def34eb775caf8eb56248d536ec56b39c47e4431':
  Ensure bar window state is SHOWING after rotate if visible.
 2013-11-06 15:23:15 -08:00
Ruben Brunk
e77d2a9c62 Merge "Disable face unlock when returning from camera." into klp-dev 2013-11-06 23:22:55 +00:00
Craig Mautner
c9d0ee5e84 Merge "Tweak test for layout." into klp-dev 2013-11-06 23:22:12 +00:00
Craig Mautner
def34eb775 Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 2013-11-06 23:19:58 +00:00
Craig Mautner
f961b3c5b6 Tweak test for layout. 
Return to old way of only laying out Keyguard on configuration change
and add a new qualifier that does a layout if a window is part of an
opening app. This qualifier allows apps that handle their own
configuration changes to be notified of screen changes after the
configuration has changed. Apps that do not handle their own
configuration changes find their way into this code because their
surfaces are recreated by default and mHaveFrame is false.

This fixes bug 11544694 and passes the test of all bugs listed in CL
ag/383579.

Change-Id: I3a679b27eb4a2c5210957bcd4ae2f10b46f6e076
 2013-11-06 14:52:36 -08:00
Adam Powell
a82be59edd Merge toast frame assets, update themes, etc. accordingly 
Bug 11355837

Change-Id: Ie221b7a8490a65c744e06474fb68f2f123762d5d
 2013-11-06 14:31:07 -08:00
Craig Mautner
b9132543b0 am a724d865: Merge "Fix incorrect looping limits." into klp-dev 
* commit 'a724d865372530e01e4bb14751e0305da9bc377b':
  Fix incorrect looping limits.
 2013-11-06 14:22:26 -08:00
Craig Mautner
a724d86537 Merge "Fix incorrect looping limits." into klp-dev 2013-11-06 22:20:25 +00:00
John Spurlock
c23bd80b38 Ensure bar window state is SHOWING after rotate if visible. 
Bug:11544694
Change-Id: Ied56f01a931f33437bdc05d026006cabcdef0149
 2013-11-06 17:09:51 -05:00
Chris Craik
222f2ad294 Fix NPE with inPurgeable Bitmaps in getAllocationByteCount 
bug:11556330
Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
 2013-11-06 14:01:28 -08:00
Craig Mautner
db5c4fb864 Fix incorrect looping limits. 
One cannot iterate across an entire list if one both removes an entry
and increments the index into the list. Do one or the other or you
will end up with bugs like 11556768 which is now fixed.

Change-Id: I57f1ad13075a005cae3c1cbfae10e230d9af143a
 2013-11-06 13:55:08 -08:00
John Spurlock
20dc49235e am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit '10b9ac807f7cc0817e8dd4b96d587ccd41f8f177':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:52:15 -08:00
John Spurlock
10b9ac807f Merge "Fix lockscreen camera preview position in RTL." into klp-dev 2013-11-06 21:48:41 +00:00
Jim Miller
78244c83fb am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '322934699433d703fa35505d72028abbcf8ce45f':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:19:27 -08:00
Jim Miller
3229346994 Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 2013-11-06 21:15:17 +00:00
Michael Wright
ce89135a53 am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit '6a29778eeb836fe01993b6dbd3734d8085f48015':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:35:03 -08:00
Michael Wright
6a29778eeb Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 2013-11-06 20:33:08 +00:00
Baligh Uddin
1c1e2da8c0 Import translations. DO NOT MERGE 
Change-Id: I74c56a144553ebe2d3d8587537f0d160fe3c6840
Auto-generated-cl: translation import
 2013-11-06 12:05:23 -08:00
Baligh Uddin
3b79bf493c Import translations. DO NOT MERGE 
Change-Id: I13dd4dfd6492c31975cd61e28caeea940a5f66cb
Auto-generated-cl: translation import
 2013-11-06 11:53:23 -08:00
John Spurlock
b6c3b20d71 Fix lockscreen camera preview position in RTL. 
Bug:11263914
Change-Id: Ic3e5157ceb82495d10afd74b3af2655434a9467c
 2013-11-06 14:44:54 -05:00
Victoria Lease
30a3ef6c85 am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit 'c89eaf916ad7e88565d2a15991432b22cd9099ff':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:33:35 -08:00
Victoria Lease
c89eaf916a Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 2013-11-06 19:30:23 +00:00
Raph Levien
4f0064fa34 Fix for Typeface.create(Typeface, style) semantics changed in KK 
This is a fix for bug 11553661. The "closest match" heuristic for
resolving a typeface when an exact match was not found changed between
JB MR2 and KK, resulting in loss of custom typeface when StyleSpan was
applied. This patch reinstates the logic that had been present. Also
reported externally as:
https://code.google.com/p/android/issues/detail?id=61771

Change-Id: Ia432fca07c4bf3b830ee2487cd8f5267a9cfb7ff
 2013-11-06 11:16:01 -08:00
Michael Jurka
f080a24e09 am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev 
* commit '04cead14b627947df7f1b713c35a3e03bef94286':
  Fix calculation of default wallpaper size
 2013-11-06 11:12:33 -08:00
Michael Jurka
04cead14b6 Merge "Fix calculation of default wallpaper size" into klp-dev 2013-11-06 19:06:50 +00:00
Ruben Brunk
21a99ddd9c Disable face unlock when returning from camera. 
Bug: 11063890

- Workaround for bug 11063890.  Avoids the acquire/release
  race when resuming face unlock while pausing the camera
  widget.
Change-Id: I0a58f3a07f346da72ea55772242b4f9c54537235
 2013-11-06 10:21:43 -08:00
Patrick Tjin
5eecb9e8d4 am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit 'bd9513f3b27a9a15a12474ff5b270abd69a013a1':
  Add HSPA+ to BatteryStats
 2013-11-06 10:16:56 -08:00
Patrick Tjin
bd9513f3b2 Merge "Add HSPA+ to BatteryStats" into klp-dev 2013-11-06 18:12:47 +00:00
Ruben Brunk
6327136cdb am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '6fe15c3d5f1b2759b06f3ce489071bb7708d7f6b':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:09:57 -08:00
Ruben Brunk
6fe15c3d5f Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 2013-11-06 18:07:28 +00:00
Adam Lesinski
35040fdc42 am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '1aac29c3dd6feece257882469d9825255c69c736':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:51:14 -08:00
Adam Lesinski
1aac29c3dd Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf Add HSPA+ to BatteryStats 
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.

Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
 2013-11-06 17:29:33 +00:00