Commit Graph

1692 Commits

Author SHA1 Message Date
Ying Wang
e0415214c8 am 50cb76f5: Rename ro.monkey to monkey.running
Merge commit '50cb76f58554dbccc51a754a73abef2debd8b721' into eclair-plus-aosp

* commit '50cb76f58554dbccc51a754a73abef2debd8b721':
  Rename ro.monkey to monkey.running
2010-01-04 12:58:54 -08:00
Ying Wang
50cb76f585 Rename ro.monkey to monkey.running
So that Monkey can set it before running and reset it after running.
2010-01-04 12:04:25 -08:00
Chia-chi Yeh
4e14211d21 Settings: revise WifiSettings. 2009-12-25 14:48:46 +08:00
Android (Google) Code Review
c7b9d2ecc3 Merge change Ibad792b8
* changes:
  Rename PdpConnection to GsmDataConnection
2009-12-22 15:43:26 -08:00
Wink Saville
0d93697d3a Rename PdpConnection to GsmDataConnection
Change-Id: Ibad792b858fd1f7abd6903b71cddcf7c58cd7ecc
2009-12-22 14:36:47 -08:00
Jeff Sharkey
1c4e96864f Allow bluetooth in airplane mode when in "toggleable" list.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode.  This CL
changes BluetoothEnabler to respect this.

It parallels the logic in WifiEnabler, which enables OEMs
to allow Wifi changes when in airplane mode.

Most existing devices don't include "bluetooth" in the
toggleable list, which means bluetooth will continue to be
disabled when in airplane mode for those devices.

Fixes http://b/2297314
2009-12-22 14:35:44 -08:00
Michael Chan
fc34079510 am f4ec356d: am d8eec52a: b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit 'f4ec356df960245889da6f7518ec28c862ebf5e6'

* commit 'f4ec356df960245889da6f7518ec28c862ebf5e6':
  b/2318290 connect should be called instead of connect(profile) if device is unpaired.
2009-12-21 14:39:06 -08:00
Michael Chan
f4ec356df9 am d8eec52a: b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp

* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
  b/2318290 connect should be called instead of connect(profile) if device is unpaired.
2009-12-21 14:36:14 -08:00
Irfan Sheriff
c9a663abf7 WifiSettings has leaked window
Fix for leaked window
Bug: 2311236
2009-12-18 14:52:14 -08:00
Michael Chan
d8eec52a37 b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
2009-12-17 14:30:05 -08:00
Michael Chan
a31ff9a139 am eea5133f: am c0a606d2: b/2334482 Revert white spaces
Merge commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3'

* commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3':
  b/2334482 Revert white spaces
2009-12-17 13:30:03 -08:00
Michael Chan
eea5133fa9 am c0a606d2: b/2334482 Revert white spaces
Merge commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d' into eclair-plus-aosp

* commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d':
  b/2334482 Revert white spaces
2009-12-17 13:28:48 -08:00
Michael Chan
c0a606d2d6 b/2334482 Revert white spaces
Change-Id: I52981da0928a9852f3256a7cee1f03768d7735a4
2009-12-17 13:21:29 -08:00
Michael Chan
8d716fad40 am 51477943: am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
Merge commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d'

* commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d':
  b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
2009-12-17 13:09:14 -08:00
Michael Chan
5147794329 am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
Merge commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38' into eclair-plus-aosp

* commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38':
  b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
2009-12-17 13:07:58 -08:00
Michael Chan
c611e5a7c6 b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
Change-Id: I36ee0f20b35df1d8f91f543dd315fc8cef184143
2009-12-17 13:04:24 -08:00
Michael Chan
51f99283c6 am fcea8c0d: am 29d70e44: b/2334482 Disable Music and audio by default for the docks
Merge commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d'

* commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d':
  b/2334482 Disable Music and audio by default for the docks
2009-12-17 11:14:29 -08:00
Michael Chan
fcea8c0d13 am 29d70e44: b/2334482 Disable Music and audio by default for the docks
Merge commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp

* commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
  b/2334482 Disable Music and audio by default for the docks
2009-12-17 11:13:08 -08:00
Michael Chan
29d70e44e4 b/2334482 Disable Music and audio by default for the docks
Change-Id: I1d84cd1dfe54dd3ae4e9183a291cb8f3e0d5da5a
2009-12-17 10:49:14 -08:00
Bjorn Bringert
7e6b3d7e6d Delete obsolete LauncherAppWidgetBinder activity
Launcher no longer needs this activity to bind
appwidgets.

Change-Id: I5c33cfc0eb02ee5d7310c14b8c2b83d818c4e4e8
2009-12-16 13:25:02 +00:00
Android Git Automerger
736409a295 Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:45:01 -08:00
Charles Chen
5dbc74ac7e Exposing the ability to select a default TTS engine to the
user by adding it into Settings.
2009-12-14 17:00:42 -08:00
Michael Chan
3a3ad73640 am 483deed6: am 2321e1dc: am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '483deed6f3d91329d02bb37af64f032e4eaa3621'

* commit '483deed6f3d91329d02bb37af64f032e4eaa3621':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
2009-12-14 15:33:50 -08:00
Michael Chan
483deed6f3 am 2321e1dc: am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '2321e1dca0abfdfca421cbd490b3c4f257d96114' into eclair-mr2-plus-aosp

* commit '2321e1dca0abfdfca421cbd490b3c4f257d96114':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
2009-12-14 15:26:10 -08:00
Romain Guy
3418cb4df5 Fix possible NPE in ActivityPicker.
Bug: 2325451.

This change also improves the UI by returning an empty drawable of the appropriate
size to make sure all labels line up correctly in the list.
2009-12-14 14:22:37 -08:00
Michael Chan
2321e1dca0 am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-mr2

* commit '052ad24219bbb170d9d028a460741524a768915a':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
2009-12-14 11:49:24 -08:00
Michael Chan
f362dbcbd6 am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp

* commit '052ad24219bbb170d9d028a460741524a768915a':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
2009-12-14 11:49:10 -08:00
Michael Chan
052ad24219 b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Change-Id: Iae98c45e4c1c5d36f33d6519ee2adba515f6b9aa
2009-12-14 10:42:27 -08:00
Eric Fischer
8711f904e0 am dd79e75a: am 20428ffb: Merge change I5bc2e0ed into eclair-mr2
Merge commit 'dd79e75a0afe65721fcb95b17bd96199a9b7a5b3'

* commit 'dd79e75a0afe65721fcb95b17bd96199a9b7a5b3':
  Add Traditional Chinese versions of the time zone names.
2009-12-11 12:25:59 -08:00
Michael Chan
46c176d112 am 0a022541: am 38badc8b: am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '0a0225418366e4502e18e414e71a04d575b1a47e'

* commit '0a0225418366e4502e18e414e71a04d575b1a47e':
  b/2320107 NPE when receiving a Undock event without a device
2009-12-11 12:25:55 -08:00
Eric Fischer
dd79e75a0a am 20428ffb: Merge change I5bc2e0ed into eclair-mr2
Merge commit '20428ffbc1ed6931e55beeb1523442e37e9a2524' into eclair-mr2-plus-aosp

* commit '20428ffbc1ed6931e55beeb1523442e37e9a2524':
  Add Traditional Chinese versions of the time zone names.
2009-12-11 12:23:40 -08:00
Michael Chan
0a02254183 am 38badc8b: am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '38badc8ba086febc93a905de91dccefa03cc1aae' into eclair-mr2-plus-aosp

* commit '38badc8ba086febc93a905de91dccefa03cc1aae':
  b/2320107 NPE when receiving a Undock event without a device
2009-12-11 12:23:37 -08:00
Android (Google) Code Review
20428ffbc1 Merge change I5bc2e0ed into eclair-mr2
* changes:
  Add Traditional Chinese versions of the time zone names.
2009-12-11 12:21:23 -08:00
Michael Chan
62698165f4 am 362d5b17: am bd0b2542: am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be'

* commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
2009-12-11 01:39:43 -08:00
Jaikumar Ganesh
615e524561 am 1aeebabf: am 3681cfb8: am 613549a6: Merge change I2c3621d1 into eclair
Merge commit '1aeebabfd3753b264eed73d3448382ebda7426d5'

* commit '1aeebabfd3753b264eed73d3448382ebda7426d5':
  Fix desk dock getting stuck after unpairing.
2009-12-10 23:45:09 -08:00
Michael Chan
0ba68d4ff6 am dcfb0dfe: am 175821f9: am d1469da1: Merge change I10036c49 into eclair
Merge commit 'dcfb0dfee1446cd6bc27eeb61c5c25e6159955b1'

* commit 'dcfb0dfee1446cd6bc27eeb61c5c25e6159955b1':
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 23:45:05 -08:00
Jaikumar Ganesh
635201de4c am d2a91007: am 41fccf2c: am 6e3ee10a: Fix auto connection of A2DP profile.
Merge commit 'd2a910077a833bac1b985c4c780172b0e43d18b6'

* commit 'd2a910077a833bac1b985c4c780172b0e43d18b6':
  Fix auto connection of A2DP profile.
2009-12-10 23:45:01 -08:00
Michael Chan
38badc8ba0 am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-mr2

* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
  b/2320107 NPE when receiving a Undock event without a device
2009-12-10 23:08:40 -08:00
Michael Chan
288bd281fd am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp

* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
  b/2320107 NPE when receiving a Undock event without a device
2009-12-10 23:07:46 -08:00
Michael Chan
9463c2f8d5 b/2320107 NPE when receiving a Undock event without a device
Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
2009-12-10 22:53:14 -08:00
Michael Chan
362d5b17c0 am bd0b2542: am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d' into eclair-mr2-plus-aosp

* commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
2009-12-10 19:55:40 -08:00
Michael Chan
bd0b2542a8 am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-mr2

* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
2009-12-10 19:48:21 -08:00
Jaikumar Ganesh
1aeebabfd3 am 3681cfb8: am 613549a6: Merge change I2c3621d1 into eclair
Merge commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6' into eclair-mr2-plus-aosp

* commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6':
  Fix desk dock getting stuck after unpairing.
2009-12-10 18:07:43 -08:00
Michael Chan
dcfb0dfee1 am 175821f9: am d1469da1: Merge change I10036c49 into eclair
Merge commit '175821f978eda0d16c4406e209a395130864d178' into eclair-mr2-plus-aosp

* commit '175821f978eda0d16c4406e209a395130864d178':
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 18:07:40 -08:00
Jaikumar Ganesh
d2a910077a am 41fccf2c: am 6e3ee10a: Fix auto connection of A2DP profile.
Merge commit '41fccf2cb3cc31a79bd59492990207247f0a5c64' into eclair-mr2-plus-aosp

* commit '41fccf2cb3cc31a79bd59492990207247f0a5c64':
  Fix auto connection of A2DP profile.
2009-12-10 18:07:36 -08:00
Eric Fischer
645258b87a Add Traditional Chinese versions of the time zone names.
http://b/issue?id=2291444
2009-12-10 18:07:19 -08:00
Jaikumar Ganesh
3681cfb83b am 613549a6: Merge change I2c3621d1 into eclair
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2

* commit '613549a622eac8278c9f81a1df83484c256652bf':
  Fix desk dock getting stuck after unpairing.
2009-12-10 17:59:14 -08:00
Michael Chan
175821f978 am d1469da1: Merge change I10036c49 into eclair
Merge commit 'd1469da150f44415135d657d57592f066670b317' into eclair-mr2

* commit 'd1469da150f44415135d657d57592f066670b317':
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 17:59:10 -08:00
Eric Fischer
d62d2810c9 am c3ce286b: (-s ours) am 11c54616: am e273289c: (-s ours) Merge change Ic0ce5c9a into eclair
Merge commit 'c3ce286b5cd1bb4faf3c1e3f804c6b27afd23fd3'

* commit 'c3ce286b5cd1bb4faf3c1e3f804c6b27afd23fd3':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:57:21 -08:00
Michael Chan
92650ea0bc am ae03d202: am c8559a52: am d70e205b: Merge change I724fc8fd into eclair
Merge commit 'ae03d202c65de85270a20900e1e80608692b815f'

* commit 'ae03d202c65de85270a20900e1e80608692b815f':
  b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
2009-12-10 17:57:18 -08:00