22616 Commits

Author SHA1 Message Date
The Android Open Source Project
e4b9834fea am 6de3a6fd: merge from open-source master
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken

* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
  Fix typo of <p> end tag in appwidgets.xml
2010-05-04 09:27:35 -07:00
The Android Open Source Project
6de3a6fdd3 merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
2010-05-04 09:20:16 -07:00
Dan Morrill
89d97c1418 Adding the backward-compatible filtering heuristics for the new device
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
2010-05-04 08:39:03 -07:00
Romain Guy
5bc30057e0 Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
dcb5f18fd6 am 007ad770: merge from open-source master
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
2010-05-03 16:25:15 -07:00
The Android Open Source Project
007ad7700a merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
James Dong
abed93a51b Support AAC recording
- Extend the audio recording to AAC format
- Add support for setting some recording parameters
- Add stss box to the meta data in the recorded file

Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
2010-05-03 15:47:41 -07:00
Jean-Baptiste Queru
0c388fd29c Adapt to new location of libcore
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
2010-05-03 09:50:38 -07:00
Melanie Clements
f19670ac86 Fix for bug 2467152 files with spaces fail to open.
from http://code.google.com/p/android/issues/detail?id=4638

If you try to use a WebView to open an image (of any type)
that is stored in your project's assets/ directory the image
will be written to the screen as text (instead of drawn as
an image) if the filename contains a space.

The problem stems from MimeTypeMap, which determines the
file type from the url.  Spaces, represented as '%20'
are not included in the list of acceptable characters for
an image file name, causing the image to be treated as plain
text.  I am remedying this by adding '%' to the list.

Change-Id: I29e3da57f3cdaa63ed60b1e6977ba62a0dd108e5
2010-05-03 10:22:41 -04:00
Scott Main
7da2269176 docs: resolve doc bug
bug:2648699

Change-Id: I8da83978953fed1952b595d5c9a36ee740287b33
2010-05-02 16:57:50 -07:00
Jean-Baptiste Queru
05bcf7553e am 2529d4ea: Adapt to new location of libcore
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken

* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
  Adapt to new location of libcore
2010-05-02 16:11:32 -07:00
Xia Wang
7eb700e0df Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:49:23 -07:00
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
2010-04-30 13:23:32 -07:00
Jean-Baptiste Queru
5b559e8168 Adapt to new location of libcore
Change-Id: Iecb39fdc6d9dc3ceb8a9bb4b3327e05caff0400e
2010-04-30 13:11:05 -07:00
Mathias Agopian
3b91e13ec7 make sure the server-side validates pointers/indices visible on the client side
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
2010-04-30 13:05:36 -07:00
Mathias Agopian
1bb8b670f9 Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 12:58:11 -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
Xia Wang
fda56b600e Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java
Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory

bug: 2644009

Change-Id: I1ecc09312f404e00bbf30befffb1811efe578cc3
2010-04-30 10:59:37 -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
5eb01a57e8 am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken

* commit '27963bbc25278885f57965f6bf8250d6eeabd94a':
  docs: editorial revisions to the bmgr tool doc
2010-04-29 21:24:25 -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
Dianne Hackborn
1443fd096b Fix build.
Change-Id: I200b8fd7de329133c44fdb66e2bd2b09ab12637d
2010-04-29 19:26:18 -07:00
Dianne Hackborn
fefe7a225e Merge "Fix build." into kraken 2010-04-29 17:59:17 -07:00
Dianne Hackborn
22ec9ab3b8 Fix build.
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -07:00
Dianne Hackborn
867ab64714 Integrate a bunch of stuff from Froyo:
Fix issue #2574016: Preferred activity setting is not persistent 14/48014/1
author	Dianne Hackborn <hackbod@google.com>
Wed, 7 Apr 2010 03:24:15 +0000 (20:24 -0700)
committer	Dianne Hackborn <hackbod@google.com>
Wed, 7 Apr 2010 03:24:15 +0000 (20:24 -0700)
commit	3cce600614c2a2643ae9a38c6ed87c06c7bab0b6
tree	394f330634ab83a97b244fbd214d5edbbd44fa52	tree | snapshot
parent	7d8866f9ef026870d4735d6f2ede49525150e53e	commit | diff
Fix issue #2574016: Preferred activity setting is not persistent

The recent tasks UI was trying to retrieve the current home activity
in the wrong way, causing it to be a different match of activities and
thus clearing any preferred activity that was set.

In the future we should look at what the package manager is doing here
and make it more robust in how it clears the list...  but for now,
this is the safest thing.

Change-Id: Idc917dffa7d05d62671213414387e8bdb2e34bea

Fix issue #2555171: Switching to app immediately after unmounting SD card causes... 28/48128/1
author	Dianne Hackborn <hackbod@google.com>
Thu, 8 Apr 2010 01:15:32 +0000 (18:15 -0700)
committer	Dianne Hackborn <hackbod@google.com>
Thu, 8 Apr 2010 01:15:32 +0000 (18:15 -0700)
commit	31abd7f677190edfa67cb96fb4ddb166e974cb3e
tree	7cc1059c3c6689ba3f2af5161585b3e7241e0580	tree | snapshot
parent	3cce600614c2a2643ae9a38c6ed87c06c7bab0b6	commit | diff
Fix issue #2555171: Switching to app immediately after unmounting SD card causes reboot.

Change-Id: I509162e136dd721fecfaabc45a046537b2d19077

Fix issue #2586349: Accelerometer is enabled when in car mode 61/48361/1
author	Dianne Hackborn <hackbod@google.com>
Fri, 9 Apr 2010 23:40:33 +0000 (16:40 -0700)
committer	Dianne Hackborn <hackbod@google.com>
Fri, 9 Apr 2010 23:40:33 +0000 (16:40 -0700)
commit	b0d3a2371f92d19d01aa2ca8e4f382738273f2dd
tree	e134d055ce8efb4ef48a74c45da0325ed55852ea	tree | snapshot
parent	eeb2497f92b8d1466918990d536e2d31b5a85c07	commit | diff
Fix issue #2586349: Accelerometer is enabled when in car mode

Change-Id: Iab5ca4ea9f69bd54f815fc7463df808d81c61ffd

Fix issue #2555171: Switching to app immediately after unmounting... 65/48665/1 dalvik-dev froyo froyo-plus-aosp froyo-release stage-korg-froyo stage-korg-master
author	Dianne Hackborn <hackbod@google.com>
Tue, 13 Apr 2010 19:48:30 +0000 (12:48 -0700)
committer	Dianne Hackborn <hackbod@google.com>
Tue, 13 Apr 2010 19:52:10 +0000 (12:52 -0700)
commit	cddfd77b45662d7316aaed3d0159d0f42d284cfc
tree	c52d612ada1f85d3d38b3e776bc520b7a0b22256	tree | snapshot
parent	5fa04b55a94b5cd98f1e6e1197cc4e6ef26a7061	commit | diff
Fix issue #2555171: Switching to app immediately after unmounting...

...SD card causes reboot.

Deal with unavailable apps in recent tasks UI.

Change-Id: Ib85b773c5c6df7afb12db551b6cef63edbc6df64
2010-04-29 16:50:14 -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
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
77a1beb137 Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Scott Main
cd845f37ba am 1d328033: am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '1d328033277aef352a80f06f3520a86cbdc9c48f' into kraken

* commit '1d328033277aef352a80f06f3520a86cbdc9c48f':
  docs: rewrite information about using shared preferences, internal and
2010-04-29 15:25:31 -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
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
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
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
Jean-Baptiste Queru
85ff3fe19e Merge "Fix an NPE in InputMethodService when mExtractAction is null." 2010-04-29 10:03:40 -07:00