Wink Saville
de5d85d10e
am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
Comment out the isAvailable optimization.
2011-01-26 19:09:22 -08:00
Scott Main
c42eb2cce7
am d2b87091: am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the
...
* commit 'd2b87091cc30c575496eb78ebea88297da775359':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 19:08:55 -08:00
Andreas Huber
e3041e19c9
am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit 'c296b5738947003c96dfc5b93c86f27b955429ff':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 19:08:49 -08:00
Jeff Brown
01f30731fe
am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 19:08:42 -08:00
Xavier Ducrohet
3d0d9937c5
am 73b58c0b: am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
...
* commit '73b58c0bd9faf99b19c1fcfe5bcf94cebd65634e':
LayoutLib: properly erase the bitmap when rendering a new session.
2011-01-26 19:08:20 -08:00
Dianne Hackborn
a09746ff34
am c0d8f88e: am 93257271: Merge "Remove xlarge specific icon size" into honeycomb
...
* commit 'c0d8f88e6aa0cd0e18ff8ddb0d4c479b06e691b4':
Remove xlarge specific icon size
2011-01-26 19:08:05 -08:00
Dianne Hackborn
635c044e7d
am 2c552372: am 8c0ac870: Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
...
* commit '2c552372ceff3025dfae6f0d2cc91b7d103970fd':
Fix another part of #3387855 : Menu flashes on left side of screen
2011-01-26 19:07:57 -08:00
Dianne Hackborn
831a010aec
am 5640392f: am 2d63144e: Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
...
* commit '5640392f584c64f048180ac75218b5c7f9281b76':
Fix issue #3380072 : Switching in and out of gmail not preserving position in label
2011-01-26 19:07:46 -08:00
Mike Lockwood
0abd82f099
am ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
...
* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
Fix javadoc for MediaStore.Files.FileColumns constants
2011-01-26 19:07:34 -08:00
Winson Chung
93781b613b
am ab4ea688: am b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
...
* commit 'ab4ea688694a3de4580d341a568e523902731855':
Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
2011-01-26 19:07:13 -08:00
Andreas Huber
edbf4b3b21
am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 19:06:43 -08:00
Jim Miller
3c70c3bad1
am eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit 'eaa738efac8cb34d57ca6c0aea4c95586b0d9fd4':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 19:06:30 -08:00
Stephen Hines
39530e77e5
Actually fix build.
...
Change-Id: I43cb042b0b8c8ac0f2e5fd9aee823298f9c29820
2011-01-26 18:07:47 -08:00
Wink Saville
93fbb0ad96
am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '13a8f2a59c063b988502de9b7197d83b5db487d9':
Comment out the isAvailable optimization.
2011-01-26 17:32:10 -08:00
Wink Saville
13a8f2a59c
Merge "Comment out the isAvailable optimization." into honeycomb
2011-01-26 17:29:32 -08:00
Scott Main
d2b87091cc
am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R
...
* commit '0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 17:09:21 -08:00
Scott Main
0f2e2b8b82
Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb
2011-01-26 17:06:45 -08:00
Andreas Huber
c296b57389
am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 16:58:04 -08:00
Jeff Brown
6774b1c592
am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 16:57:38 -08:00
Xavier Ducrohet
73b58c0bd9
am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
...
* commit 'ee37ab8dce5fe60d9a2af411ae9e38e3e44589ed':
LayoutLib: properly erase the bitmap when rendering a new session.
2011-01-26 16:54:31 -08:00
Xavier Ducrohet
ee37ab8dce
Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
2011-01-26 16:52:49 -08:00
Andreas Huber
586096a957
am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 16:40:04 -08:00
Xavier Ducrohet
5a82d8c58b
LayoutLib: properly erase the bitmap when rendering a new session.
...
This fix the issue where going from a full theme to a dialog theme
would show the dialog on top of the previous rendering.
Change-Id: Ib52b9719f44b04969423547b9de8d039f90b6f46
2011-01-26 16:34:53 -08:00
Dianne Hackborn
c0d8f88e6a
am 93257271: Merge "Remove xlarge specific icon size" into honeycomb
...
* commit '93257271add728749a181e0580f2e71f3c4f129c':
Remove xlarge specific icon size
2011-01-26 16:30:54 -08:00
Dianne Hackborn
2c552372ce
am 8c0ac870: Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
...
* commit '8c0ac8708761872082c75aedc5fa4b25d1286fd0':
Fix another part of #3387855 : Menu flashes on left side of screen
2011-01-26 16:30:49 -08:00
Dianne Hackborn
93257271ad
Merge "Remove xlarge specific icon size" into honeycomb
2011-01-26 16:28:46 -08:00
Dianne Hackborn
5640392f58
am 2d63144e: Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
...
* commit '2d63144ed94dff0832d051ec355f56649244dd4e':
Fix issue #3380072 : Switching in and out of gmail not preserving position in label
2011-01-26 16:28:38 -08:00
Dianne Hackborn
8c0ac87087
Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
2011-01-26 16:27:40 -08:00
Dianne Hackborn
428ecb65b5
Fix another part of #3387855 : Menu flashes on left side of screen
...
When task switching while dialog windows were up, the exit animation
wouldn't be seen. The animation needs to force Z-order its windows
to the top.
Also fix a bug where the lock screen fade-out was immediately
Z-ordering the wallpaper to the bottom if the activity behind was
not on top of the wallpaper.
Change-Id: Icd45cd8ccfff9829822c1682931413246eb9601b
2011-01-26 16:26:48 -08:00
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
Dianne Hackborn
2d63144ed9
Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
2011-01-26 16:25:49 -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
Andreas Huber
2dce338e01
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
And now we're just ignoring them. Yay standards.
Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug: 3353752
2011-01-26 16:03:33 -08:00
Kenny Root
fd66a020bd
Remove xlarge specific icon size
...
app_icon_size was set to 64dip for xlarge screens resulting in blurry
icons. They were loaded as mdpi (48x48) and scaled up to 64x64 which
looks bad.
Change-Id: I6f8f0c1d11aea3bd1e3a6ebf008aeef10cd4e47e
2011-01-26 16:00:29 -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
Andreas Huber
bba92023e5
am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 15:52:48 -08:00
Stephen Hines
7c4a66be94
Fix build breakage.
...
Change-Id: I3fc80c719e7bfa2940af9257f46694232c0162a3
2011-01-26 15:51:29 -08:00
Jim Miller
eaa738efac
am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit '85433c76066843d20c92c90d64e842e4f14dbac8':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 15:50:41 -08:00
Andreas Huber
63b38e31aa
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
2011-01-26 15:50:04 -08:00
Jim Miller
85433c7606
Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
2011-01-26 15:47:40 -08:00
Romain Guy
c02a1cc1b1
am 62bea428: am 9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
...
* commit '62bea4287dafc88b640d7e3fc8a433ddd858a5b8':
Optimize invalidate() calls.
2011-01-26 15:46:21 -08:00
Fabrice Di Meglio
036dfd0653
am 3782fe2b: am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
...
* commit '3782fe2b23c4a6fa2e512f1d200ffa85c37bfb14':
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
2011-01-26 15:46:17 -08:00
Wink Saville
9f7a0b2b02
Comment out the isAvailable optimization.
...
As the comment says this causes problems if the connection
is handling errors. This removes the optimization for now.
Bug: 3386481
Change-Id: I6cb00abe8b1949e9b79b4906a6bdab5872b5054d
2011-01-26 15:43:49 -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
Andreas Huber
0f535afd7e
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
And now we're just ignoring them. Yay standards.
Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
2011-01-26 15:40:56 -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