Daniel Sandler
83b236c880
am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
2010-04-30 15:07:37 -07:00
Dianne Hackborn
47c0c942b0
Fix issue #2555171 : Switching to app immediately after unmounting...
...
...SD card causes reboot.
Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.
Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
2010-04-30 14:24:18 -07:00
Daniel Sandler
b205dabaa7
am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
...
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken
* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
Tweak style of recent apps dialog title.
2010-04-30 11:34:03 -07:00
Daniel Sandler
d47cdbb7ea
am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
...
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp
* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
Tweak style of recent apps dialog title.
2010-04-30 11:30:29 -07:00
Daniel Sandler
3bb5e4d322
Merge "Tweak style of recent apps dialog title." into froyo
2010-04-30 10:55:03 -07:00
Daniel Sandler
e6f134ae63
Tweak style of recent apps dialog title.
...
Lovingly hand-crafted to UX's specification.
Bug: 2614279
Change-Id: I14a50e80ed4d97e5d14c7a94586380a27c845263
2010-04-30 13:36:13 -04:00
Dianne Hackborn
09d91ca47c
am fefe7a22: Merge "Fix build." into kraken
2010-04-29 18:01:33 -07:00
Dianne Hackborn
22ec9ab3b8
Fix build.
...
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -07:00
Marc Blank
5b4628f71a
am 8abcce1f: am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
2010-04-29 17:09:25 -07:00
Marc Blank
8abcce1f7b
am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
...
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken
* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
Expose _id in ExtendedProperties subValues
2010-04-29 16:28:50 -07:00
Marc Blank
9ca816649b
am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
...
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp
* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
Expose _id in ExtendedProperties subValues
2010-04-29 15:40:30 -07:00
Marc Blank
794cd640bf
Merge "Expose _id in ExtendedProperties subValues" into froyo
2010-04-29 15:39:37 -07:00
Kenny Root
946db27161
am 82b027e9: am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo
2010-04-29 15:34:36 -07:00
Kenny Root
82b027e90e
am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo
...
Merge commit '48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken
* commit '48399e38c978a66ac4c6054c8681a246dfc94b4b':
Import revised translations
2010-04-29 15:31:23 -07:00
Kenny Root
48399e38c9
am 77a1beb1: Merge "Import revised translations" into froyo
...
Merge commit '77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp
* commit '77a1beb137948ad45423bb8fcd7e424e36144133':
Import revised translations
2010-04-29 15:29:22 -07:00
Kenny Root
67d609e93f
Import revised translations
...
Change-Id: I94756035b7d3bfe2027c578a6c1578df5219f8ea
2010-04-29 15:25:21 -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
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
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
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
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
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
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
Gilles Debunne
0ab6dd0e26
Merge "Changed steps names in documentation."
2010-04-28 10:26:20 -07:00
Kenny Root
fb9856218a
am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo
2010-04-28 09:56:45 -07:00
Kenny Root
5d84df0c82
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
Kenny Root
9fe5551452
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
Kenny Root
4bba2149f3
Merge "Import revised translations" into froyo
2010-04-28 08:05:03 -07:00
Steve Howard
db1e48a9de
Merge "New drawables for the pending update to the maps API."
2010-04-27 19:20:08 -07:00
Vasu Nori
b57f85bc5b
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
3d2b69ff8a
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
Adam Powell
ea58d14e23
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
f910cf4dcb
am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 18:56:12 -07:00
Gilles Debunne
7f4b6842ce
Changed steps names in documentation.
...
Change-Id: I0541709a719e35575bb2c42e6f2ea457d21c545b
2010-04-27 17:54:21 -07:00
Vasu Nori
6813f8d291
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