21620 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
2010-04-30 13:23:32 -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
Patrick Tsai
bd742e4336 Fix typo of <p> end tag in appwidgets.xml
Change-Id: Ic1f4d8ade0d32f3b74decbe557d4275dc2e19466
2010-05-01 00:30:19 +08:00
Scott Main
d17da43c82 docs: revise and add documentation for backup APIs
Change-Id: I0b015a6de16da07ccd31756b8d2329dc2785c2f7
2010-04-29 21:42:58 -07:00
Scott Main
27963bbc25 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
2010-04-29 21:23:10 -07:00
Scott Main
cd8f7bd4e5 Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -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
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
77a1beb137 Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Kenny Root
67d609e93f Import revised translations
Change-Id: I94756035b7d3bfe2027c578a6c1578df5219f8ea
2010-04-29 15:25:21 -07:00
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
takuo
42b21c3333 Parse custom text header and ignore it.
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.

Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
2010-04-30 07:11:53 +09: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
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
takuo
334dc0b270 Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
And take the first part of parsed as a parent part data.

Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
2010-04-30 05:12:19 +09: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
Jean-Baptiste Queru
85ff3fe19e Merge "Fix an NPE in InputMethodService when mExtractAction is null." 2010-04-29 10:03:40 -07:00
Jey
2eebf5cacd 'uses-library' was not working for persistent applications.
Fix by generating the applicationInfo, when asked for info.

Change-Id: I44686d5a306562c6649148dce8f709e682adcdf4
2010-04-29 08:19:06 -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
Steve Kondik
59eb69192c Fix an NPE in InputMethodService when mExtractAction is null.
This happens with certain third-party IMEs.

Fixes: http://code.google.com/p/cyanogenmod/issues/detail?id=231

Change-Id: Idf4349ee9c7c8f73c255745bc65b49ba9b593874
2010-04-28 16:37:01 -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
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
c8652199d1 merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
2010-04-28 15:50:56 -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
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
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
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
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
hugh kennedy
c6f8ea4cf2 speling fix
Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
2010-04-28 15:04:10 -04:00
Scott Main
ff8c7ad697 docs: editorial revisions to the bmgr tool doc
Change-Id: Ide8fbfae07af3a02511bef301f839c8a56b3e874
2010-04-28 11:23:00 -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
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
Scott Main
eaa801e22a 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
785c898357 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
Vasu Nori
996960dea8 Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 16:44:58 -07:00
Dianne Hackborn
048b40ebdc am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit 'e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp

* commit 'e367896e91a0d75250f00f2de3929495595719d4':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
2010-04-27 16:42:42 -07:00