5631 Commits

Author SHA1 Message Date
Android (Google) Code Review
ba272be725 Merge change 9097
* changes:
  Wifi: Add support for enabling Wifi while in airplane mode.
2009-07-30 08:35:03 -07:00
Android (Google) Code Review
c17ae711e9 am 0067057c: Merge change 9035 into donut
Merge commit '0067057c31720f64926d6ee3d841b15dc197d2df'

* commit '0067057c31720f64926d6ee3d841b15dc197d2df':
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-30 06:57:23 -07:00
Android (Google) Code Review
0d39ce852e am 3d716ed6: (-s ours) Merge change 9021 into donut
Merge commit '3d716ed6a3274cc49dc08029d7ace683b99200ac'

* commit '3d716ed6a3274cc49dc08029d7ace683b99200ac':
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-30 06:57:14 -07:00
Jean-Baptiste Queru
95528d4384 am f4dc9da3: Merge snapshot variant of donut back into the main tree
Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'

* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
  donut snapshot
2009-07-30 06:57:04 -07:00
Android (Google) Code Review
cdc0d941e8 am 2bad713f: Merge change 8860 into donut
Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'

* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
  Fix bug 2017664
2009-07-30 06:56:37 -07:00
Wink Saville
98ad09880b am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
2009-07-30 06:56:24 -07:00
Android (Google) Code Review
1d359556d8 Merge change 9098
* changes:
  CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Mike Lockwood
bd5ddf01e4 Wifi: Add support for enabling Wifi while in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 21:37:14 -07:00
Android (Google) Code Review
6502a380ad Merge change 9090
* changes:
  Simplify image loading.  Use common internal format.
2009-07-29 21:06:23 -07:00
Jason Sams
0ea8c8a7c0 Simplify image loading. Use common internal format. 2009-07-29 21:05:11 -07:00
Android (Google) Code Review
7518f16793 Merge change 9089
* changes:
  Filmstrip work and boxed bitmap load bugfixes.
2009-07-29 20:57:02 -07:00
Jason Sams
faf1520be7 Filmstrip work and boxed bitmap load bugfixes. 2009-07-29 20:55:44 -07:00
yong liu
c84401fb8b CDMA Message Waiting Indication support
Add support for Message Waiting Info Record defined in 3GPP2 C.S-0005
and used for voice mail count by some CDMA networks
2009-07-29 20:54:03 -07:00
Yong Zhang
96f2747dd6 Fix wrong Singal Strength interpretation.
The issue this change fixes is that phone status bar shows full
signal strength bar even when phone is in bad signal area. The
root cause is that the signal strenth  is incorrectly interpreted.
2009-07-29 20:39:52 -07:00
Android (Google) Code Review
206b7b1709 Merge change 8974
* changes:
  Fix OOB in arraycopy.
2009-07-29 18:28:12 -07:00
Android (Google) Code Review
75ac5fb875 Merge change 9065
* changes:
  Checkin art assets for film test app and change loading of icons to 8888.
2009-07-29 17:43:05 -07:00
Jason Sams
31b532ee9e Checkin art assets for film test app and change loading of icons to 8888. 2009-07-29 17:39:45 -07:00
Android (Google) Code Review
fc6627a892 Merge change 9054
* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().
2009-07-29 17:03:04 -07:00
Yong Zhang
6afac8b292 Increase waiting time for data disable action in setPowerStateToDesired().
The issue this change fixes is that phone did not send MIP deregisteration
and LCP termination message when user powered down phone while data call was
in dormant state.  The root cause is Framework Telephony did not wait long
enough before it sent the request to power off the radio. The fix is to
increase the waiting timer.
2009-07-29 17:01:24 -07:00
Jinghui Guo
79ef673d56 Disable data call in emergency call 2009-07-29 16:58:11 -07:00
Android (Google) Code Review
977e67bb50 am 0869f7ef: Merge change 8962 into donut
Merge commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa'

* commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa':
  Log uid and package name when launching intents from search
2009-07-29 16:48:40 -07:00
Android (Google) Code Review
26e287ccb5 Merge change 9040
* changes:
  Don't offer to add numbers to the dictionary.
2009-07-29 16:48:34 -07:00
Android (Google) Code Review
ba58c6f228 am ad346278: Merge change 8208 into donut
Merge commit 'ad346278fe129a341543d4a75bf9cc08c50742f8'

* commit 'ad346278fe129a341543d4a75bf9cc08c50742f8':
  Removing MD2
2009-07-29 16:45:22 -07:00
Android (Google) Code Review
cda5ad5b70 am 9b91d78a: Merge change 8911 into donut
Merge commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8'

* commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8':
  Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden
2009-07-29 16:45:14 -07:00
Android (Google) Code Review
d1399070b9 Merge change 9052
* changes:
  Less log spew.
2009-07-29 16:43:38 -07:00
Joe Onorato
2d9c9e3f67 Less log spew. 2009-07-29 16:43:06 -07:00
Android Git Automerger
ce41050023 resolved conflicts for merge of 4d4229e4 to master 2009-07-29 16:42:09 -07:00
Joe Onorato
e712ee3fe1 Take ctate's suggestions from 9008. 2009-07-29 16:23:58 -07:00
Eric Fischer
56cf7889d2 Don't offer to add numbers to the dictionary.
Only show the "add to dictionary" context menu item if the current word
contains at least one letter.

Bug 1877803
2009-07-29 15:52:44 -07:00
Android (Google) Code Review
0067057c31 Merge change 9035 into donut
* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-29 15:27:55 -07:00
Jack Veenstra
5d5cd178e3 Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes. 2009-07-29 15:19:23 -07:00
Android (Google) Code Review
3d716ed6a3 Merge change 9021 into donut
* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-29 14:52:11 -07:00
Wink Saville
9953eb27ed DO NOT MERGE - Fix CNAP-related NullPointerException
This will fix a CNAP-related bug where missing a call from a party with an
"Unknown" number presentation and then trying to log that call will cause
a NullPointerException to be thrown.

This was already merged into master so marked will not be merged.
2009-07-29 14:51:26 -07:00
Android (Google) Code Review
bbdf3cafe9 am 67897b1a: (-s ours) Merge change 8884 into donut
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'

* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
  DO NOT MERGE. Already in master. Fix calendar test.
2009-07-29 14:47:50 -07:00
Android (Google) Code Review
b2b28f3122 am 1521cd6e: Merge change 8015 into donut
Merge commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead'

* commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead':
  Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.
2009-07-29 14:47:41 -07:00
Jean-Baptiste Queru
f4dc9da372 Merge snapshot variant of donut back into the main tree 2009-07-29 14:31:38 -07:00
Jean-Baptiste Queru
a8675f67e3 donut snapshot 2009-07-29 14:25:07 -07:00
Android (Google) Code Review
afa7d85b43 Merge change 9008
* changes:
  Only restore the bits for wallpapers that aren't built in.
2009-07-29 14:10:12 -07:00
Android (Google) Code Review
1c3f760dcd Merge change 9004
* changes:
  Fix NullPointerException when checking if its a sinkDevice.
2009-07-29 13:57:41 -07:00
Android (Google) Code Review
e4162b2129 Merge change 9011
* changes:
  Allow zero-length lists in EventLog entries.   (I'm verifying that the consumers of EventLog -- logcat, checkin -- are OK with this.) Improve the error handling in RestoreSession.
2009-07-29 13:23:24 -07:00
Dan Egnor
0084da561e Allow zero-length lists in EventLog entries.
(I'm verifying that the consumers of EventLog -- logcat, checkin -- are OK with this.)
Improve the error handling in RestoreSession.
2009-07-29 12:57:16 -07:00
Jesse Wilson
ff1907f60a Updating API XML for the java.util.concurrent update. 2009-07-29 12:06:13 -07:00
Joe Onorato
9bb8fd77c8 Only restore the bits for wallpapers that aren't built in. 2009-07-29 12:05:36 -07:00
Jaikumar Ganesh
0ba3cfaa56 Fix NullPointerException when checking if its a sinkDevice. 2009-07-29 11:43:25 -07:00
Android (Google) Code Review
2bad713f31 Merge change 8860 into donut
* changes:
  Fix bug 2017664 Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention. Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine. Renamed the TextToSpeech.Engine constants that are used as extras for the   ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_. Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of   "TTS" in the name.
2009-07-29 11:38:44 -07:00
Jean-Michel Trivi
ed06578edd Fix bug 2017664
Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention.
Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine.
Renamed the TextToSpeech.Engine constants that are used as extras for the
  ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_.
Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of
  "TTS" in the name.
2009-07-29 11:26:10 -07:00
Android (Google) Code Review
8b6a3807f1 Merge change 8997
* changes:
  GLESv2 couldn't be loaded due to wrong path specification
2009-07-29 11:11:13 -07:00
Mathias Agopian
c902bf8f13 GLESv2 couldn't be loaded due to wrong path specification 2009-07-29 11:10:29 -07:00
Jesse Wilson
de5dc2bba9 New current.xml to correspond to the util.concurrent updates. 2009-07-29 10:49:10 -07:00
Wink Saville
b307c8945d Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
2009-07-29 10:25:09 -07:00