Commit Graph

15016 Commits

Author SHA1 Message Date
Michael Chan
3fe86a346c b/2332395 Disable BT when undocked if BT was off to at docking time
unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt

Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
2010-01-19 16:15:44 -08:00
Dianne Hackborn
feff652132 Initial UI for managing device policies.
More to come...  what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
2010-01-16 18:30:05 -08:00
Amith Yamasani
6ff80dcf7a Fix #2377870 : NPE in Dock settings
If the Dock settings is launched after reboot but before it is docked,
the settings screen crashes because the dock status is not available.

This fixes the case where there was never a pending intent for dock status.
2010-01-15 19:10:55 -08:00
Chia-chi Yeh
feeb756132 WifiEnabler: add support to show supplicant state. 2010-01-16 07:09:20 +08:00
Amith Yamasani
0e2ab4f884 New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
 audio settings or a dialog saying that you're not docked and you need to
 buy a new dock from Google (kidding).
2010-01-15 11:53:42 -08:00
Michael Chan
c9b9f650fc Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair 2010-01-14 15:17:30 -08:00
Chia-chi Yeh
b90452f3d2 Settings: revise WifiEnabler and BluetoothEnabler.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.

Related bug: 2053751
2010-01-15 06:12:29 +08:00
Michael Chan
845e740fc6 b/2367861 Auto connect if the user turns on BT while docked.
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
2010-01-14 11:26:18 -08:00
Suchi Amalapurapu
e751e555f7 Merge "Change filter options from being menu items to tabbed views. Remove unused strings." 2010-01-12 16:41:21 -08:00
Suchi Amalapurapu
38b8970706 Change filter options from being menu items to tabbed views.
Remove unused strings.
2010-01-12 16:41:45 -08:00
Amith Yamasani
d8d2127936 Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair 2010-01-12 16:10:17 -08:00
Amith Yamasani
20043f40fc Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
Backport from froyo.

If the monkey is running, exit the SIM lock settings activity.
2010-01-12 14:55:16 -08:00
San Mehat
0b12a7b207 Merge "Settings: Switch to new MountService api names" 2010-01-12 13:50:28 -08:00
Michael Chan
07723b5966 am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.
Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'

* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
  b/2367020 Enable bt profiles by default for car dock.
2010-01-12 13:45:36 -08:00
Michael Chan
c5aa68f3f2 b/2367020 Enable bt profiles by default for car dock.
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
2010-01-12 12:54:51 -08:00
San Mehat
33b0202273 Settings: Switch to new MountService api names
Signed-off-by: San Mehat <san@google.com>
2010-01-12 12:22:37 -08:00
Jim Miller
00d2476d8f Fix 2332563: Add password-lock support to lockscreen 2010-01-11 15:51:59 -08:00
Michael Chan
fb5b54d77a b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
2010-01-08 18:33:43 -08:00
Michael Chan
89a363ebbc Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state." 2010-01-08 18:14:38 -08:00
Michael Chan
537bdb0bb8 b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state.
Change-Id: I4428708e02e7dcbb26795b0982cfe4389df60a46
2010-01-08 17:17:08 -08:00
Romain Guy
3378715626 Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:59 -08:00
Amith Yamasani
2e180ef880 Don't allow monkey to play with SIM lock settings. Bug # 2358489
If the monkey is running, exit the SIM lock settings activity.
2010-01-07 19:05:07 -08:00
Irfan Sheriff
567c44814f Merge "Do a null check on setting an AP as configured" 2010-01-07 10:53:52 -08:00
San Mehat
35351faed3 settings: Change unmount button to a mount/unmount toggle
Signed-off-by: San Mehat <san@google.com>
2010-01-06 21:41:47 -08:00
Irfan Sheriff
94a9f0a4ab Do a null check on setting an AP as configured
This was introduced when trying to fix bug 2296038. A null check is required on AP.

Bug: 2296038
2010-01-06 16:54:21 -08:00
Joe Onorato
0ea48d08f7 Merge "Stop spamming the log" 2010-01-06 14:05:14 -08:00
Joe Onorato
7111eea380 Stop spamming the log 2010-01-06 14:01:36 -08:00
Ying Wang
8d1d83ce13 am 759f48ba: am a718832e: Still use ro.monkey
Merge commit '759f48ba1345a8827f217f8db3c71edfca1458c1'

* commit '759f48ba1345a8827f217f8db3c71edfca1458c1':
  Still use ro.monkey
2010-01-06 13:57:51 -08:00
Ying Wang
a718832e28 Still use ro.monkey
http://b/issue?id=1681101
So just some refactoring.
2010-01-06 09:46:17 -08:00
Dianne Hackborn
517ea9ffea Update to use new ActivityManager.forceStopPackage() API. 2010-01-05 15:47:41 -08:00
Ying Wang
18e5cc1b1a am e0415214: am 50cb76f5: Rename ro.monkey to monkey.running
Merge commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee'

* commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee':
  Rename ro.monkey to monkey.running
2010-01-04 13:49:34 -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
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
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
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
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
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
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
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
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