23081 Commits

Author SHA1 Message Date
Scott Main
1d32803327 am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp

* commit '764caf2481d935ce6870ec141f1e845178df8b47':
  docs: rewrite information about using shared preferences, internal and
2010-04-29 15:23:32 -07:00
Scott Main
764caf2481 Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:21:34 -07:00
Marc Blank
8f643c1040 Expose _id in ExtendedProperties subValues
* ExtendedValues' "name" and "value" columns are exposed in Entry
  entity subvalues, but it is clumsy to change a value, as the _id
  of the ExtendedValues row isn't also exposed.  (We otherwise have to
  perform a potentially slow query)
* This CL adds the _id column to the columns exposed

Bug: 2638762
Change-Id: Iaffeffed620af78439f5f73aa5f3257b0f8a0fd0
2010-04-29 14:50:37 -07:00
Mathias Agopian
b638bd08b9 am daedd81f: Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken 2010-04-29 14:34:26 -07:00
Mathias Agopian
9ab5edd204 am 1d0fa397: Merge "fix a race condition in undoDequeue(), where \'tail\' could be computed incorrectly." into kraken 2010-04-29 14:34:21 -07:00
Mathias Agopian
daedd81f08 Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken 2010-04-29 14:17:12 -07:00
Mathias Agopian
1d0fa397ce Merge "fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly." into kraken 2010-04-29 14:16:14 -07:00
Dianne Hackborn
6b44915b60 am 9eef6311: am d8f34720: am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update 2010-04-29 13:54:12 -07:00
Scott Main
779de5c040 docs: rewrite information about using shared preferences, internal and
external storage (including new apis), and sqlite databases.

Change-Id: Ib951f14764759a04beca7b24767fb1e927245ebd
2010-04-29 13:50:52 -07:00
Dianne Hackborn
9eef631136 am d8f34720: am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'd8f34720a1eb87770c854928410c753e0969d3ac' into kraken

* commit 'd8f34720a1eb87770c854928410c753e0969d3ac':
  Fix issue #2641875: Apps on sdcard not accesible after update
2010-04-29 12:22:52 -07:00
Dianne Hackborn
d8f34720a1 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
2010-04-29 12:20:42 -07:00
Dianne Hackborn
c956f37567 Fix issue #2641875: Apps on sdcard not accesible after update
Change-Id: I541aa040939e6a872f0b7e8e82e44f96de49d97a
2010-04-29 11:56:40 -07:00
Makoto Onuki
2589716964 Make RequeryOnUiThreadException warning less spamy
- Moved the thread check from AbstractCursor to SQLiteCursor.
- Show warning only once per database

Bug 2633883

Change-Id: I915bfba8715a469c45fb68ba1282231279f2a50c
2010-04-29 11:36:48 -07:00
Steve Block
286fbce557 Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list" 2010-04-29 03:27:29 -07:00
Adam Powell
8c2d5cf826 am 6bbb65e6: am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 2010-04-28 19:45:04 -07:00
Adam Powell
6bbb65e6fc am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken

* commit '6483f6d546655a9579670b42d445614cab609e28':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:38:41 -07:00
Adam Powell
6483f6d546 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:34:49 -07:00
Dianne Hackborn
8640c1d0e5 am 14cee9f6: New xlarge screen size. 2010-04-28 16:58:05 -07:00
Dianne Hackborn
14cee9f688 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
Adam Powell
b40c42f1ff Fix bug 2639949 - Don't stop a Scroller early
Change-Id: Ia827199a27d03289b6fa573dd6f2b13517943400
2010-04-28 16:36:37 -07:00
Steve Howard
0c0b1b3a07 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
bfe7f0b121 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
f590f702c8 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
c54c12713b 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
3fd6419fe5 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
3b20c9e805 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
81ac367be6 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
509f1c0d6f am 32de26bb: am c8652199: merge from open-source master 2010-04-28 15:58:36 -07:00
The Android Open Source Project
32de26bbe7 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
c8652199d1 merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
2010-04-28 15:50:56 -07:00
Vasu Nori
ca3a7b9bc5 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
43f2c35bf3 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
91a62f3d4a 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
a07c4cbea9 Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo 2010-04-28 15:35:57 -07:00
Vasu Nori
020e534579 bug:2622719 move 'forcing of cursor execution' to ContentProvider
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR

Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
2010-04-28 15:32:54 -07:00
Amith Yamasani
6ef7677e4f 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
2b7012c308 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
087b25f7e2 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
6e4895b63a Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 2010-04-28 15:18:15 -07:00
Steve Howard
c64d537e9b Fix a minor bug in transitions to left-edge-up landscape.
Fix MAX_TRANSITION_TILT to remove the entry for upside-down
orientation, which should've been removed when that orientation itself
was removed.  This was causing the phone to require further vertical
tilt for transitions to left-edge-up landscape, as compared to
right-edge-up landscape or portait mode.

Bug: 2639310
Change-Id: I8fe2e2baecd6a9c2cecae95d316b0d4e2f8ee251
2010-04-28 15:08:45 -07:00
Joe Malin
b8aa7fe50e 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
2e192931d5 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
2bf0f1a3c1 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
00b92b943f 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
9aaf24f2a4 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
cd11e8cddf 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
Amith Yamasani
c4938fd619 Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
The SimpleDateFormat was being cached and new timezone not being applied. Make sure
to apply the new timezone to the format object as soon as it changes.

Change-Id: I72abfef2e14cf5db5a6e8cb71b053380b695495c
2010-04-28 13:20:43 -07:00
Dianne Hackborn
655bf11de1 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
725f731cb9 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
bc5a03286a Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 2010-04-28 12:42:00 -07:00