Jean-Michel Trivi
d83e548dd4
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:15:15 -08:00
Stephen Hines
6b193fed09
am 203107d4: am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '203107d4901704c33eca2e5f7e5cd967fd372bbe':
Hook up tgammaf properly for RS.
2011-01-26 14:13:06 -08:00
Jean-Michel Trivi
b8efdf7f80
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:12:45 -08:00
Stephen Hines
203107d490
am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
2011-01-26 14:10:58 -08:00
Stephen Hines
8fc7690f2b
Merge "Hook up tgammaf properly for RS." into honeycomb
2011-01-26 14:08:49 -08:00
Jean-Michel Trivi
1155efdc71
am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Romain Guy
cf5afe9299
am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
Remove unused API
2011-01-26 13:44:35 -08:00
Romain Guy
08cdf6fd9a
am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '940df6dd83624e5f46b147837d848853a1dab9b2':
Remove unused API
2011-01-26 13:42:53 -08:00
Romain Guy
940df6dd83
Merge "Remove unused API" into honeycomb
2011-01-26 13:41:10 -08:00
Romain Guy
2b1847ea60
Remove unused API
...
Change-Id: I1714fd82a64b752f0350ef4ef9179ce19e089c6a
2011-01-26 13:43:01 -08:00
Gilles Debunne
cff0ade069
am 9aa5b8da: am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '9aa5b8dad015f08251a3a75c9f790e86670c6914':
Holo theme for error popups in TextViews.
2011-01-26 13:37:07 -08:00
Gilles Debunne
9aa5b8dad0
am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '12b2dc23cc3cdd9dcd6bac91adc8e4198502bab5':
Holo theme for error popups in TextViews.
2011-01-26 13:35:28 -08:00
Gilles Debunne
12b2dc23cc
Merge "Holo theme for error popups in TextViews." into honeycomb
2011-01-26 13:33:24 -08:00
Adam Cohen
f95bc64438
am eca572f5: am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit 'eca572f5d9c073b789de027df2971860eb393d6d':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:30:44 -08:00
Adam Cohen
eca572f5d9
am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit '10f27c5a42e6da262d178d426944b2b31c185f4a':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:29:07 -08:00
Shimeng (Simon) Wang
af58bdaa8e
am c1df157a: am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit 'c1df157a60164e23ac45701d9e5da6d4edcc756c':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:28:34 -08:00
Adam Cohen
10f27c5a42
Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
2011-01-26 13:26:58 -08:00
Shimeng (Simon) Wang
c1df157a60
am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit '078378624c1955a1e842af34f79798918edccc21':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:25:50 -08:00
Shimeng (Simon) Wang
078378624c
Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
2011-01-26 13:23:58 -08:00
Adam Cohen
2035a4657a
Fixing bug where widgets would go dead after moving to another screen
...
-> A memory optimization was causing AdapterViewAnimator to give up its
reference to its adapter, rendering the widget dead.
-> Did testing, and it doesn't appear that this optimization was
making a difference, so it appears safe to remove.
Change-Id: I274c5f73862cbda2dc5411d5c94a9ba1ac1e3635
2011-01-26 13:22:59 -08:00
Justin Ho
7f6f3c4961
am 4b1c8389: am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '4b1c838959b27b14209f8f446f95630232b93cef':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:05:38 -08:00
Justin Ho
4b1c838959
am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '8a445fc30e45c1f7a9805ae19948ec32786458a0':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:04:18 -08:00
Justin Ho
8a445fc30e
Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
2011-01-26 13:02:01 -08:00
Daniel Sandler
bb7f6ad52f
am 26d7aea7: am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '26d7aea7b7bd4439cf85ea0a2d2d58b05a0f4642':
Ticker visual fixes.
2011-01-26 12:55:16 -08:00
Daniel Sandler
26d7aea7b7
am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
2011-01-26 12:53:58 -08:00
Dharmaray Kundargi
7a58635e84
am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
5af2ce4c5f
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:51:58 -08:00
Daniel Sandler
044602b226
Merge "Ticker visual fixes." into honeycomb
2011-01-26 12:51:30 -08:00
Dharmaray Kundargi
666b9eb3a2
am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
81bebad0f1
am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit 'ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:48:28 -08:00
Dharmaray Kundargi
45e3d123bc
Merge "Overlay java files Issue 3370836" into honeycomb
2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
ecebf173de
Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
2011-01-26 12:46:20 -08:00
Mathias Agopian
a135040311
am 947bbc91: am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit '947bbc914a3c6723dcd8ff1fcca2fc61e557bacc':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:44:47 -08:00
Mathias Agopian
947bbc914a
am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit 'a0f40033c03a0b64538bf1c22f83d3c9a325ff87':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:43:16 -08:00
Mathias Agopian
a0f40033c0
Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
2011-01-26 12:41:02 -08:00
Winson Chung
dd071fea23
am 38fe6ff4: am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '38fe6ff45a6cbc328d1b92c9b9d79c65c3fb29ae':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:35:21 -08:00
Winson Chung
38fe6ff45a
am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:32:50 -08:00
Stephen Hines
d6a5b40cc7
Hook up tgammaf properly for RS.
...
Change-Id: I9b489cbfe49b3c01028f23c1123bc272e100c60e
b: 3370708, 2933146
2011-01-26 12:31:36 -08:00
Winson Chung
2c070bae44
Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
2011-01-26 12:30:26 -08:00
Jaikumar Ganesh
3b4c86af20
am 48f73779: am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit '48f737798070471cefeeaf418c75ea55f8b925e9':
Fix some unmatched javadoc tags.
2011-01-26 12:27:58 -08:00
Daniel Sandler
6aa2d3a166
Ticker visual fixes.
...
- Includes the correct ticker background image, finally
- Confines the ticker height to 48dp (status bar height)
- Aligns the ticker to the bottom of the screen
Bug: 3361133
Change-Id: I9497f29d2b4c1cbcb195f0e66393f6db97d01ee2
2011-01-26 15:25:36 -05:00
Jaikumar Ganesh
48f7377980
am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit 'e9b644fcef08b0716efd3843ca7152e75cde3447':
Fix some unmatched javadoc tags.
2011-01-26 12:25:29 -08:00
Jaikumar Ganesh
e9b644fcef
Merge "Fix some unmatched javadoc tags." into honeycomb
2011-01-26 12:23:15 -08:00
Andreas Huber
17c914a067
am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:12:33 -08:00
Andreas Huber
bd36c2230b
am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:12:28 -08:00
Andreas Huber
11934aa321
am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:10:00 -08:00
Andreas Huber
1a6e6d55b8
am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:09:56 -08:00
Winson Chung
16c8d8a558
Re-enabling queued unbinding of services after requests to the service. (3394210)
...
- Fix for crash when detaching from window
- Potential fix for occasional IllegalStateException when updating List based widgets
Change-Id: I3d3f2bb691552a1136111043db686c4926b510c6
2011-01-26 12:09:27 -08:00
Gilles Debunne
5f059e4663
Holo theme for error popups in TextViews.
...
Bug 3277308
Change-Id: I9711adb848df975b95ad09fc84bba4b970e44670
2011-01-26 12:08:45 -08:00
Andreas Huber
373d357a8b
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
2011-01-26 12:08:09 -08:00