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

119355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Eric Laurent
4feaa2e0b6 am 1a231f5f: am e661b541: am 7791b84c: Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev 
* commit '1a231f5fdabb00e491d86abf878efb15588012da':
  AudioService: fix notifications with A2DP abs volume
 2013-11-06 08:52:07 -08:00
Michael Jurka
f35fac93cd am b1b0266d: am 8ef6da5c: am b922178d: Merge "More background protection in Recents for status bar" into klp-dev 
* commit 'b1b0266dc7dd1e91bc40900085c9bb85356612db':
  More background protection in Recents for status bar
 2013-11-06 08:52:01 -08:00
Eric Laurent
1a231f5fda am e661b541: am 7791b84c: Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev 
* commit 'e661b541a5b0b1d427e613df8d6f060bcf3ba80e':
  AudioService: fix notifications with A2DP abs volume
 2013-11-06 08:44:19 -08:00
Eric Laurent
e661b541a5 am 7791b84c: Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev 
* commit '7791b84c153463431635d2a8aa0fda7f1d8763a7':
  AudioService: fix notifications with A2DP abs volume
 2013-11-06 08:40:55 -08:00
Eric Laurent
7791b84c15 Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev 2013-11-06 16:39:12 +00:00
Michael Jurka
b1b0266dc7 am 8ef6da5c: am b922178d: Merge "More background protection in Recents for status bar" into klp-dev 
* commit '8ef6da5c9e40ae73a4f73be72df28d51fffcfaad':
  More background protection in Recents for status bar
 2013-11-06 05:01:22 -08:00
Michael Jurka
8ef6da5c9e am b922178d: Merge "More background protection in Recents for status bar" into klp-dev 
* commit 'b922178dce8464aa46203812d8bd4424c47ba486':
  More background protection in Recents for status bar
 2013-11-06 04:58:34 -08:00
Michael Jurka
b922178dce Merge "More background protection in Recents for status bar" into klp-dev 2013-11-06 12:38:23 +00:00
Michael Jurka
eed96a0b90 Fix calculation of default wallpaper size 
Bug: 11324470
 2013-11-06 13:22:51 +01:00
John Spurlock
1288608eee am 46cfab75: am b2b56eae: am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev 
* commit '46cfab7587920d7175308952ab575954a81b3aff':
  Update remaining settings icon with old style.
 2013-11-05 19:18:05 -08:00
John Spurlock
46cfab7587 am b2b56eae: am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev 
* commit 'b2b56eaeb19e8974bc7c1fee5039c0491e07fe8f':
  Update remaining settings icon with old style.
 2013-11-05 19:15:16 -08:00
John Spurlock
feafc99bdf am fc5ef04e: am e88d14a8: am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev 
* commit 'fc5ef04e4d1e3eca1d807d00f12a3f84f8028b8b':
  Fix recent regression in DrawableContainer.
 2013-11-05 18:59:18 -08:00
Chris Craik
ab2525dd60 am 8c08fc27: am f918444f: am 6fbd4829: Merge "Work around nested SaveLayerAlpha bug" into klp-dev 
* commit '8c08fc27bba86f92773a5bcb0a14e8e4e03e5de1':
  Work around nested SaveLayerAlpha bug
 2013-11-05 18:59:14 -08:00
John Spurlock
fc5ef04e4d am e88d14a8: am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev 
* commit 'e88d14a8b8101248ce0a3b3b00993fd1393f6be2':
  Fix recent regression in DrawableContainer.
 2013-11-05 18:56:58 -08:00
Chris Craik
8c08fc27bb am f918444f: am 6fbd4829: Merge "Work around nested SaveLayerAlpha bug" into klp-dev 
* commit 'f918444fdd34183c2577efe05a05ad3a0cdaba27':
  Work around nested SaveLayerAlpha bug
 2013-11-05 18:56:52 -08:00
John Spurlock
b2b56eaeb1 am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev 
* commit '499c7eeb9ad59e5449481eb871db24a176f2ccdb':
  Update remaining settings icon with old style.
 2013-11-05 18:50:36 -08:00
John Spurlock
499c7eeb9a Merge "Update remaining settings icon with old style." into klp-dev 2013-11-06 02:48:07 +00:00
John Spurlock
88f3d6bde0 Update remaining settings icon with old style. 
Bug:11412369
Change-Id: I7827e3060d9dbf320c23ac7c43e4ef4a5fae3773
 2013-11-05 21:41:23 -05:00
John Spurlock
e88d14a8b8 am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev 
* commit '9d383ece52620b0358bcfae7f2102b64acd1d5cb':
  Fix recent regression in DrawableContainer.
 2013-11-05 18:35:00 -08:00
John Spurlock
9d383ece52 Merge "Fix recent regression in DrawableContainer." into klp-dev 2013-11-06 02:29:20 +00:00
Chris Craik
f918444fdd am 6fbd4829: Merge "Work around nested SaveLayerAlpha bug" into klp-dev 
* commit '6fbd4829a9614f0d6c668cd5ccba6cabdaeb81a0':
  Work around nested SaveLayerAlpha bug
 2013-11-05 18:23:00 -08:00
Chris Craik
6fbd4829a9 Merge "Work around nested SaveLayerAlpha bug" into klp-dev 2013-11-06 02:20:20 +00:00
Adam Powell
18e905f42d Make Scenes and Transitions first-class in PhoneWindow/Themes 
Add a window feature for content transitions. This implicitly creates
a Scene for each setContentView operation and runs the appropriate
transition. Applications can specify a TransitionManager XML in their
theme that will apply the appropriate transitions when these implicit
scene changes occur. Apps can specify a "to" with no "from" in a
transition to request an entrance transition for the given
content. This lays the groundwork for further full content
change/activity to activity transitions.

Change-Id: Ic815d9e0b9ce958152d70bf6ee01be075aa9fe88
 2013-11-05 17:49:56 -08:00