Dianne Hackborn
e9a27e2f27
am 14cee9f6: New xlarge screen size.
2010-04-28 16:58:05 -07:00
Dianne Hackborn
c93a781c24
New xlarge screen size.
...
Not complete, only for experimentation at this point.
This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.
The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.
Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
2010-04-28 16:51:52 -07:00
Steve Howard
bfbdf471cf
am 3fd6419f: am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
2010-04-28 16:14:51 -07:00
Mathias Agopian
c0a9164e9e
Add support for enqueuing buffers in arbitrary order
...
Also added a very simple SharedBufferStack unit test.
Change-Id: I253dbbe98a53c966b78d22d4d6dd59f8aefc8c40
2010-04-28 16:12:54 -07:00
Mathias Agopian
b296533607
cleanup. waitForCondition() now uses polymorphsim instead of templtes
...
the reason for the above change is that waitForCondition() had become
large over time, mainly to handle error cases, using inlines to
evaluate the condition doesn't buys us much anymore while it increases
code size.
Change-Id: I2595d850832628954b900ab8bb1796c863447bc7
2010-04-28 16:12:54 -07:00
Mathias Agopian
0a8cd0689a
fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly.
...
in the undoDequeue() case, 'tail' was recalculated from 'available' and 'head'
however there was a race between this and retireAndLock(), which could cause
'tail' to be recalculated wrongly.
the interesting thing though is that retireAndLock() shouldn't have any impact
on the value of 'tail', which is client-side only attribute.
we fix the race by saving the value of 'tail' before dequeue() and restore it
in the case of undoDequeue(), since we know it doesn't depend on retireAndLock().
Change-Id: I4bcc4d16b6bc4dd93717ee739c603040b18295a0
2010-04-28 16:12:54 -07:00
Steve Howard
fd4a232374
am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
...
Merge commit '3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken
* commit '3b20c9e80533401d8c423977ef86460d789d4e1e':
Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:07:18 -07:00
Steve Howard
76d91325dc
am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
...
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp
* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:03:28 -07:00
Steve Howard
16e1998488
Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
2010-04-28 15:59:39 -07:00
The Android Open Source Project
0c10cdbbaf
am 32de26bb: am c8652199: merge from open-source master
2010-04-28 15:58:36 -07:00
The Android Open Source Project
62e14af34c
am c8652199: merge from open-source master
...
Merge commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d' into kraken
* commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d':
speling fix
2010-04-28 15:54:35 -07:00
The Android Open Source Project
658e62322d
merge from open-source master
...
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
2010-04-28 15:50:56 -07:00
Vasu Nori
1f6de0006b
am 43f2c35b: am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
2010-04-28 15:50:49 -07:00
Vasu Nori
c148df2343
am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
...
Merge commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken
* commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
bug:2622719 move 'forcing of cursor execution' to ContentProvider
2010-04-28 15:42:23 -07:00
Vasu Nori
bd05a99fc7
am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
...
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp
* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
bug:2622719 move 'forcing of cursor execution' to ContentProvider
2010-04-28 15:38:44 -07:00
Vasu Nori
4196629d75
Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo
2010-04-28 15:35:57 -07:00
Amith Yamasani
e2795eba14
am 2b7012c3: am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
2010-04-28 15:32:38 -07:00
Amith Yamasani
3e7271634a
am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
...
Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken
* commit '087b25f7e2669497cf217d873437e8726c139abd':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
2010-04-28 15:25:05 -07:00
Amith Yamasani
08464b5b36
am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
...
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
2010-04-28 15:21:37 -07:00
Amith Yamasani
2bbb1cce02
Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
2010-04-28 15:18:15 -07:00
Joe Malin
1ab45d1624
Merge "Doc Change: Add images for the index file for the SpinnerTest test application sample. Change-Id: Ib9957ee7c9691534452c96c44a5823acdd3d2185"
2010-04-28 14:46:03 -07:00
Fred Quintana
3ac5ae0cc2
am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
2010-04-28 14:25:19 -07:00
Fred Quintana
93d41f38bb
am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
...
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken
* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
revert a change in the SyncManager that caused it to not cancel
2010-04-28 14:18:19 -07:00
Fred Quintana
e47930cd65
am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
...
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
revert a change in the SyncManager that caused it to not cancel
2010-04-28 14:13:55 -07:00
Fred Quintana
23894ce086
Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
2010-04-28 14:10:05 -07:00
Dianne Hackborn
0e55d1efd9
am 655bf11d: am 725f731c: am bc5a0328: Merge "Fix issue #2569139 : Sapphire user cannot login to last.fm..." into froyo
2010-04-28 13:28:18 -07:00
Dianne Hackborn
93120c58c4
am 725f731c: am bc5a0328: Merge "Fix issue #2569139 : Sapphire user cannot login to last.fm..." into froyo
...
Merge commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken
* commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0':
Fix issue #2569139 : Sapphire user cannot login to last.fm...
2010-04-28 13:19:25 -07:00
Dianne Hackborn
240d6d2042
am bc5a0328: Merge "Fix issue #2569139 : Sapphire user cannot login to last.fm..." into froyo
...
Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp
* commit 'bc5a03286a72dc3627cee313d473178f5a123049':
Fix issue #2569139 : Sapphire user cannot login to last.fm...
2010-04-28 13:14:43 -07:00
Dianne Hackborn
6f34aa18b7
Merge "Fix issue #2569139 : Sapphire user cannot login to last.fm..." into froyo
2010-04-28 12:42:00 -07:00
James Dong
ddd5c2dae6
am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into kraken
2010-04-28 12:10:43 -07:00
James Dong
3204749935
Merge "Use timestamp from camera driver for CameraSource" into kraken
2010-04-28 12:03:55 -07:00
James Dong
f06bb989d6
Use timestamp from camera driver for CameraSource
...
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
2010-04-28 11:55:47 -07:00
Gilles Debunne
2b5e6da77e
Merge "Changed steps names in documentation."
2010-04-28 10:26:20 -07:00
Kenny Root
18da4a5d69
am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo
2010-04-28 09:56:45 -07:00
Scott Main
a11824d3c9
am 5785cb2f: am ca54674c: am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse
2010-04-28 09:56:41 -07:00
Kenny Root
fa8e0c18a8
am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo
...
Merge commit '9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken
* commit '9fe55514524993936eafe9e77e3dd98ba17a78b6':
Import revised translations
2010-04-28 09:47:27 -07:00
Scott Main
48cebd44c4
am ca54674c: am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE
...
Merge commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a' into kraken
* commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a':
docs: update information about developing on a device.
2010-04-28 09:47:19 -07:00
Kenny Root
8345be2b2d
am 4bba2149: Merge "Import revised translations" into froyo
...
Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp
* commit '4bba2149f3f2709b24dc40118461c5d683ed6965':
Import revised translations
2010-04-28 09:32:55 -07:00
Scott Main
4e6c55e259
am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp
...
Merge commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp
* commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
docs: update information about developing on a device.
2010-04-28 09:31:28 -07:00
Kenny Root
10159e9986
Merge "Import revised translations" into froyo
2010-04-28 08:05:03 -07:00
Steve Howard
2e132b2324
Merge "New drawables for the pending update to the maps API."
2010-04-27 19:20:08 -07:00
Vasu Nori
ff47b64dbd
am 6813f8d2: am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
2010-04-27 18:57:14 -07:00
Dianne Hackborn
4989fbeca7
am 16afc5ed: am 048b40eb: am e367896e: Merge "Fix issue #2594388 : WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
2010-04-27 18:57:10 -07:00
Shimeng (Simon) Wang
8ecc19f525
am 7095d75e: am 447beb52: am 05fd7e7d: Add good international characters to the path part of Url pattern.
2010-04-27 18:56:34 -07:00
Adam Powell
27b5b9842f
am 067521f9: am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo
2010-04-27 18:56:18 -07:00
Fred Quintana
6de87c4bca
am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 18:56:12 -07:00
Scott Main
1ffd118cab
Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo
2010-04-27 18:35:53 -07:00
Vasu Nori
2267e70cb3
am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
...
Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken
* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
remove myname accidentally included in one of the files
2010-04-27 16:53:16 -07:00
Vasu Nori
dff737bf08
am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
...
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp
* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
remove myname accidentally included in one of the files
2010-04-27 16:49:29 -07:00
Dianne Hackborn
0e9659ab93
am 048b40eb: am e367896e: Merge "Fix issue #2594388 : WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
...
Merge commit '048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken
* commit '048b40ebdc980906193cfcb66274e2a1f3ec6093':
Fix issue #2594388 : WallpaperService doesn't always call onSurfaceDestroyed()
2010-04-27 16:45:19 -07:00