Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,016 Commits 3 Branches 0 Tags
cbcd9be4104b3872902898b84fae92d1623fd8f1
Commit Graph

23016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
cbcd9be410 Fix a few more Javadoc typos. 
Change-Id: Id43fe2551ef53c1a0a779c6101ea0bc7c23e1f93
 2010-04-29 12:35:07 -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
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
James Dong
dcc05ca971 am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into kraken 2010-04-28 12:10:43 -07:00
hugh kennedy
c6f8ea4cf2 speling fix 
Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
 2010-04-28 15:04:10 -04:00
James Dong
b30bf6ef93 Merge "Use timestamp from camera driver for CameraSource" into kraken 2010-04-28 12:03:55 -07:00
James Dong
b00e246669 Use timestamp from camera driver for CameraSource 
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
 2010-04-28 11:55:47 -07:00
Dianne Hackborn
92cfa105f9 Fix issue #2569139: Sapphire user cannot login to last.fm... 
...after upgrade from Donut to FRF01B

For realz this time.

Change-Id: I92bd12451b19a6006cf487a9dfa0b7c696a21122
 2010-04-28 11:00:44 -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
Scott Main
1cf237ec7a 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
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
Scott Main
5785cb2f46 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
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
Scott Main
ca54674c65 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
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