Commit Graph

10353 Commits

Author SHA1 Message Date
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Jaikumar Ganesh
33232d26bb Merge "Add UUID property for adapter." into kraken 2010-05-05 15:25:54 -07:00
Dianne Hackborn
f41f444d12 Merge "First pass at NativeActivity." into kraken 2010-05-05 15:18:59 -07:00
Dianne Hackborn
69969e48f2 First pass at NativeActivity.
This is a rough sketch of the new pure-native API, which you can
use through a NativeActivity in your manifest (no Java code in
the .apk needed!).

Intentionally no docs yet, the API is still being seriously
messed with.  But it works.

Change-Id: I0e916d58a0d159ecaf3689e41834eb8dc681c0c0
2010-05-05 15:17:26 -07:00
mogimo
b032bc0373 Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Jean-Michel Trivi
99fb50468c am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken

* commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:06:12 -07:00
Jean-Michel Trivi
fc12b5be2e am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp

* commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:03:43 -07:00
Jean-Baptiste Queru
f1fdf3c7e8 Merge "Call register_localized_collators() with the current locale." 2010-05-05 11:16:31 -07:00
Jean-Michel Trivi
13b18fd7f9 Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
sound.
This CL doesn't fix why mView can be null in the first place, but
prevents a crash when mView is null and a UI sound is to be played.

Change-Id: I74ea03567e8e6ebebb6c95c80a473abf11e1163d
2010-05-05 09:37:41 -07:00
Daisuke Miyakawa
5763c1f501 Call register_localized_collators() with the current locale.
Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

This is a partial cherry-pick of b945639d0c

BUG: 2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
2010-05-05 09:01:48 -07:00
Dianne Hackborn
d9d009d721 am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken

* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
b6179a7069 am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken

* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
  Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
3445dae3f5 am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
0c698e6e78 am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
2010-05-04 18:22:36 -07:00
Dianne Hackborn
65b2561c3b Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Dianne Hackborn
4416c3d6e4 Fix issue #2643754: Launcher is caching widget layouts for too long
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed.  Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.

Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00
Bjorn Bringert
c9dc10908a Merge "Build searchables list after boot" into froyo 2010-05-04 16:57:56 -07:00
Jaikumar Ganesh
94278c9fd2 Add UUID property for adapter.
4.64 version of Bluez has the UUID property of adapter being reported.

Change-Id: Ibf451a14d58620ba8bea812cd302be0b4def5f74
2010-05-04 15:57:50 -07:00
Jaikumar Ganesh
c0cec62454 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: Icf0abeb3dfc794bb3371b1c427aa15755fbe84c7
2010-05-04 15:56:11 -07:00
Jaikumar Ganesh
ca4d4de865 Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:53:31 -07:00
Jaikumar Ganesh
9997f66f62 Revert "Fix runtime reboot when connecting to a A2DP headset and"
This reverts commit 55b0110fc2.
2010-05-04 15:52:42 -07:00
Bjorn Bringert
2c7b197a4a Build searchables list after boot
This avoids delaying the first launch of QuickSearchBox or Browser
after boot while SearchManagerService builds the searchables list.

Bug http://b/issue?id=2639863

Change-Id: Ia510204691ecf487a2008723fe8f6caaced86618
2010-05-04 23:49:24 +01:00
Adam Powell
37f4f5b1ea am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
Adam Powell
d135f74b97 am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Jaikumar Ganesh
55b0110fc2 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
2010-05-04 15:28:27 -07:00
Jean-Baptiste Queru
f32cdca3cf Merge "Fix for bug 2467152 files with spaces fail to open." 2010-05-04 15:16:32 -07:00
Adam Powell
151af19bf4 Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
2010-05-04 14:44:45 -07:00
Scott Main
ebad36db56 am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
Scott Main
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Daniel Sandler
f24e66dbb9 am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
2010-05-04 12:45:53 -07:00
Joe Onorato
07779ac16e am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:45:44 -07:00
Daniel Sandler
342a3800b9 am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
2010-05-04 12:42:48 -07:00
Daniel Sandler
70c6bb0d3e Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Joe Onorato
77da731221 am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:37:59 -07:00
Joe Onorato
f140be6c3c Call into app widget hosts when the provider is updated.
Change-Id: If0a2459901e88cf04810b23178e4673d44fa69cc
2010-05-04 11:49:12 -07:00
Nicholas Killewald
0ba2d4782c Fixed deserialization problem in DatePicker.
During onRestoreInstanceState for DatePicker, the internal
state of the widget is restored properly (thus setting the
internal year, month, and day), but the spinners aren't
visually updated to that state immediately. That is to say,
the internal state of the widget doesn't match the spinners
in that case, which can cause confusion.

Change-Id: I96d1a299d0ee159d41450470acb30a3bf6006d44
2010-05-04 11:48:22 -07:00
Daniel Sandler
5d0ef0d90a Increase the row height of menus by 1dip.
This prevents CJK characters, which have extra-tall
ascenders, from being clipped by the drawable in
IconMenuItemView.

Bug: 2330380
Change-Id: I1256b85122e1634d5220c648111a5ffe43879f1f
2010-05-04 14:33:28 -04: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
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
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
Scott Main
d17da43c82 docs: revise and add documentation for backup APIs
Change-Id: I0b015a6de16da07ccd31756b8d2329dc2785c2f7
2010-04-29 21:42:58 -07:00
Dianne Hackborn
22ec9ab3b8 Fix build.
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -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