diff options
| author | Michael Chan <mchan@android.com> | 2010-01-12 13:42:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 13:42:04 -0800 |
| commit | d69a5ee28cb5164233805a751a7c3deafba58668 (patch) | |
| tree | 8b748fb5544b5c9a906c629905c49393e5c6052c | |
| parent | 79270566b178ed7efc1c62f8410822d46d6e3152 (diff) | |
| parent | c5aa68f3f2201227e85e52ee33937e70e7741c3c (diff) | |
| download | packages_apps_settings-d69a5ee28cb5164233805a751a7c3deafba58668.zip packages_apps_settings-d69a5ee28cb5164233805a751a7c3deafba58668.tar.gz packages_apps_settings-d69a5ee28cb5164233805a751a7c3deafba58668.tar.bz2 | |
am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/2367020 Enable bt profiles by default for car dock.
| -rw-r--r-- | src/com/android/settings/bluetooth/DockService.java | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java index 46e3d08..4545b4e 100644 --- a/src/com/android/settings/bluetooth/DockService.java +++ b/src/com/android/settings/bluetooth/DockService.java @@ -374,26 +374,32 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli mCheckedItems = new boolean[numOfProfiles]; CharSequence[] items = new CharSequence[numOfProfiles]; - int i = 0; switch (state) { case Intent.EXTRA_DOCK_STATE_CAR: - items[i] = service.getString(R.string.bluetooth_dock_settings_headset); - mProfiles[i] = Profile.HEADSET; + items[0] = service.getString(R.string.bluetooth_dock_settings_headset); + items[1] = service.getString(R.string.bluetooth_dock_settings_a2dp); + mProfiles[0] = Profile.HEADSET; + mProfiles[1] = Profile.A2DP; if (firstTime) { - mCheckedItems[i] = false; + // Enable by default for car dock + mCheckedItems[0] = true; + mCheckedItems[1] = true; } else { - mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager, + mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager, Profile.HEADSET).isPreferred(device); + mCheckedItems[1] = LocalBluetoothProfileManager.getProfileManager(mBtManager, + Profile.A2DP).isPreferred(device); } - ++i; - // fall through + break; + case Intent.EXTRA_DOCK_STATE_DESK: - items[i] = service.getString(R.string.bluetooth_dock_settings_a2dp); - mProfiles[i] = Profile.A2DP; + items[0] = service.getString(R.string.bluetooth_dock_settings_a2dp); + mProfiles[0] = Profile.A2DP; if (firstTime) { - mCheckedItems[i] = false; + // Disable by default for desk dock + mCheckedItems[0] = false; } else { - mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager, + mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager, Profile.A2DP).isPreferred(device); } break; |