Mike Lockwood
ba492eb636
am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
...
* commit '278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
Fix javadoc for MediaStore.Files.FileColumns constants
2011-01-26 16:26:26 -08:00
Mike Lockwood
278a04eb7a
Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
2011-01-26 16:24:19 -08:00
Winson Chung
ab4ea68869
am b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
...
* commit 'b90a91c633e99d4559095184af27d1416541d3c0':
Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
2011-01-26 16:14:03 -08:00
Winson Chung
b90a91c633
Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
...
- Also tweaking disconnect delay, cache size, and memory limit
Change-Id: If67188dcb363e5a2fbc02736f82bfd783af02533
2011-01-26 16:09:09 -08:00
Mike Lockwood
ed723b4095
Fix javadoc for MediaStore.Files.FileColumns constants
...
BUG: 3370225
Change-Id: Ie793771b131031f8457859990dca7b6fb9ba47aa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-26 15:57:07 -08:00
Romain Guy
62bea4287d
am 9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
...
* commit '9e7c2c6ded1144122915cfb8bd663e789c7eb93b':
Optimize invalidate() calls.
2011-01-26 15:43:09 -08:00
Fabrice Di Meglio
3782fe2b23
am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
...
* commit 'f728411ba40d71a40a0cb0dbfcaa44764af17692':
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
2011-01-26 15:42:55 -08:00
Romain Guy
9e7c2c6ded
Merge "Optimize invalidate() calls." into honeycomb
2011-01-26 15:40:16 -08:00
Romain Guy
0fd89bf722
Optimize invalidate() calls.
...
Change-Id: I09d99290ca74f96046702bc2604f125a1276ce05
2011-01-26 15:41:30 -08:00
Fabrice Di Meglio
f728411ba4
Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
2011-01-26 15:39:24 -08:00
Fabrice Di Meglio
dc2dd88249
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
...
- add human readable error messages
Change-Id: Ib6937684e61aca80b2c3bc78fd67b93c3df61d17
2011-01-26 15:35:47 -08:00
Svetoslav Ganov
54fc78072f
am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit 'df4672643b92208b4ab7f9ab995dca8b69d3c458':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:41:33 -08:00
Svetoslav Ganov
df4672643b
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
2011-01-26 14:39:47 -08:00
Romain Guy
2b1847ea60
Remove unused API
...
Change-Id: I1714fd82a64b752f0350ef4ef9179ce19e089c6a
2011-01-26 13:43:01 -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
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
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
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
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
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
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
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
Shimeng (Simon) Wang
7114f3bf6d
Fine tune the high memory threshold and usage delta for v8 GC.
...
This will help reduce a bit more v8 GC for heavy web sites.
issue: 3317574
Change-Id: I5f93f9311fc864fb13933f92ff402e00c0e6fcdf
2011-01-26 11:56:30 -08:00
Joe Onorato
a4a5ec5e74
am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:48:48 -08:00
Joe Onorato
1aadb2108d
Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* changes:
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:46:58 -08:00
Jaikumar Ganesh
0706fed520
Fix some unmatched javadoc tags.
...
Bug: 3392175
Change-Id: I84aa86c07060bc4ba399fd5c8f7cda162b432031
2011-01-26 11:46:56 -08:00
Kenny Root
7dbf0696ef
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
2c1d0967ba
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00
Romain Guy
7c55da5db5
am f5b27e35: Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
...
* commit 'f5b27e35c1e0e46ffd882606d0783875e1a1ff7b':
Fix NPE in YouTube. Bug #3385339
2011-01-26 10:56:08 -08:00
Romain Guy
d30b36d3cd
Fix NPE in YouTube.
...
Bug #3385339
Change-Id: Id7b307994e343cdb808161a7fae590536f04252e
2011-01-26 10:54:43 -08:00
Romain Guy
f5b27e35c1
Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
2011-01-26 10:54:23 -08:00
Joe Onorato
14782f705e
Expose the window flags for lights out mode.
...
I hadn't wanted to do this, but it makes porting the FLAG_FULLSCREEN
stuff over to this simpler because you don't have to go find a view
to proxy through.
This change also clears the flag everywhere when the window manager
notifies the views that the change has come back.
Change-Id: I48392c7550925bcca50c5bb9e1f263e99de6c7bc
2011-01-26 10:47:39 -08:00
Joe Onorato
644f9c3ad9
Make FLAG_FULLSCREEN not go into lights out mode anymore.
...
Change-Id: I4a0aa8789f537717f82df4efb6a35108e1ab1784
2011-01-26 10:32:18 -08:00
Kenny Root
ff271a2288
am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '2ec4af59209ab3a7088a001bbbcb10ef0b846564':
Make OBB results a one-way call
2011-01-26 10:11:21 -08:00
Leon Scroggins
666158e09b
am 8b2d4825: Merge "Move last touch point when moving the cursor node." into honeycomb
...
* commit '8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22':
Move last touch point when moving the cursor node.
2011-01-26 10:08:17 -08:00
Leon Scroggins
8b2d4825e1
Merge "Move last touch point when moving the cursor node." into honeycomb
2011-01-26 10:06:42 -08:00
Kenny Root
2ec4af5920
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Jaikumar Ganesh
b774f261ea
am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
...
* commit 'ff3b3ade7fa1da60d391d1a746cdc0868c24f4bf':
Revert "Temporary Changes for certification of SCO."
2011-01-26 09:19:31 -08:00
Kenny Root
138757db4f
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Jaikumar Ganesh
5a9ac240fe
Revert "Temporary Changes for certification of SCO."
...
This reverts commit 75c2701454f4506664d9056988c8ce5fd0ca73ba.
Change-Id: Ic63cdbbb06b9ed2d9c48e8b29cc376059ecadebf
2011-01-26 09:08:50 -08:00
Jaikumar Ganesh
b8a1a415f3
am 8ef1179e: Merge "Improve readability of java docs for the public APIs." into honeycomb
...
* commit '8ef1179efce1c8b1107df707afdce8f85404d39e':
Improve readability of java docs for the public APIs.
2011-01-26 09:04:47 -08:00
Jaikumar Ganesh
8ef1179efc
Merge "Improve readability of java docs for the public APIs." into honeycomb
2011-01-26 09:02:12 -08:00
Leon Scroggins
cef1c59efc
Move last touch point when moving the cursor node.
...
Bug:3241968
Bug:3387455
The code was already in place, but needs to happen before we
return if mHeightCanMeasure == false.
Change-Id: Ic07dac4c4471bf4e2189f3fee322adeb23703f41
2011-01-26 11:13:24 -05:00