PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.

Browse Source 
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp

* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
  b/2367020 Enable bt profiles by default for car dock.
This commit is contained in:
Michael Chan
2010-01-12 13:42:04 -08:00
committed by Android Git Automerger
parent 79270566b1 c5aa68f3f2
commit d69a5ee28c
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/bluetooth/DockService.java
View File

@@ -374,26 +374,32 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
mCheckedItems = new boolean[numOfProfiles]; mCheckedItems = new boolean[numOfProfiles];
CharSequence[] items = new CharSequence[numOfProfiles]; CharSequence[] items = new CharSequence[numOfProfiles];
int i = 0;
switch (state) { switch (state) {
case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_CAR:
items[i] = service.getString(R.string.bluetooth_dock_settings_headset); items[0] = service.getString(R.string.bluetooth_dock_settings_headset);
mProfiles[i] = Profile.HEADSET; items[1] = service.getString(R.string.bluetooth_dock_settings_a2dp);
mProfiles[0] = Profile.HEADSET;
mProfiles[1] = Profile.A2DP;
if (firstTime) { if (firstTime) {
mCheckedItems[i] = false; // Enable by default for car dock
mCheckedItems[0] = true;
mCheckedItems[1] = true;
} else { } else {
mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager, mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
Profile.HEADSET).isPreferred(device); Profile.HEADSET).isPreferred(device);
mCheckedItems[1] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
Profile.A2DP).isPreferred(device);
} }
++i; break;
// fall through
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
items[i] = service.getString(R.string.bluetooth_dock_settings_a2dp); items[0] = service.getString(R.string.bluetooth_dock_settings_a2dp);
mProfiles[i] = Profile.A2DP; mProfiles[0] = Profile.A2DP;
if (firstTime) { if (firstTime) {
mCheckedItems[i] = false; // Disable by default for desk dock
mCheckedItems[0] = false;
} else { } else {
mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager, mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
Profile.A2DP).isPreferred(device); Profile.A2DP).isPreferred(device);
} }
break; break;