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

119701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Spurlock
574ad40c26 am cd6258b5: am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit 'cd6258b50f94d69a3ba677c2d17bed824c10cdd2':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:57:47 -08:00
John Spurlock
cd6258b50f am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:55:18 -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
Jason Sams
b7189d2f35 Merge "Use Object + type in place of specific array" 2013-11-06 21:55:04 +00: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
17a93ff130 am 5a31605a: am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '5a31605a034e990a68567597bbf9ccbc8cb28494':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:25:09 -08:00
Jim Miller
5a31605a03 am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '78244c83fb633895c95f3c93ab874be979cf42e3':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:22:16 -08: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
Adam Powell
d033e67afe Merge "Make Scenes and Transitions first-class in PhoneWindow/Themes" 2013-11-06 21:14:03 +00:00
Michael Wright
a1dc9fc9d5 am 09bfaa79: am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit '09bfaa7991066703d1dca87b4ab8e68a30076990':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:39:30 -08:00
Michael Wright
09bfaa7991 am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit 'ce89135a53b1f5c0e7f34dbae12794f4421d9390':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:36:41 -08: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
9ddba37a3f Import translations. DO NOT MERGE 
Change-Id: I7e69767911d65642caa7f21b190e58b31e137303
Auto-generated-cl: translation import
 2013-11-06 12:31:52 -08:00
Maxim Siniavine
ca76692417 Fix BandwidthTest to report correct stats. 
The test used to report report stats for a random uid. Fixed it to report
stats for the Instrumentation uid or download manager uid, depending on the test.

Change-Id: I089162c19e25cbf0dfb05645a9a1018dd7567423
 2013-11-06 12:11:07 -08: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
6ccf625559 Import translations. DO NOT MERGE 
Change-Id: I659e58b641a7a154bca5ea33413aff6cde07635a
Auto-generated-cl: translation import
 2013-11-06 11:54:16 -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
Baligh Uddin
ca6c7fc653 Import translations. DO NOT MERGE 
Change-Id: Ie33acfe6f39d170f88a99ec57ee960dc62c84ee0
Auto-generated-cl: translation import
 2013-11-06 11:52:19 -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
d0d4b00ac5 am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit 'dd3776d673776785f32aa7d813871a38de906c5d':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:39:58 -08:00
Victoria Lease
dd3776d673 am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit '30a3ef6c85011ba82a777e6eef7f026323019f35':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:37:15 -08: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
Jason Sams
e729a9400f Use Object + type in place of specific array 
Changed to avoid the explosion of entry points in the JNI layer.

Change-Id: I7d6cc565c8853b06560eb891fdd5e8acf05c9779
 2013-11-06 11:22:02 -08:00
Michael Jurka
b52856129c am 065f321d: am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev 
* commit '065f321de92cfe8e86eaaeb86f0a0420c9300fbf':
  Fix calculation of default wallpaper size
 2013-11-06 11:17:37 -08: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
065f321de9 am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev 
* commit 'f080a24e09eed73159e1e877dce2b6bf81744d40':
  Fix calculation of default wallpaper size
 2013-11-06 11:15:28 -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
Patrick Tjin
09e0244f72 am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit 'b4328566fa415b69974a9721ec690a1b74880873':
  Add HSPA+ to BatteryStats
 2013-11-06 10:22:32 -08: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
b4328566fa am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats
 2013-11-06 10:20:00 -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
Ruben Brunk
23e1866700 am 57171905: am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '57171905216515a187ecb9931d402c3b09ab4b50':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:15:29 -08:00
Ruben Brunk
5717190521 am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '6327136cdb1a0438132ea9d91c3b498a034ec071':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:13:03 -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
2efc144775 am 9aaf4e13: am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '9aaf4e13f0abac9bdee001eb513746c851f22051':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:57:32 -08:00
Adam Lesinski
9aaf4e13f0 am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '35040fdc428669bf7e3a1ec9ea388fb49ede32df':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:54:46 -08: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