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

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

Browse Source 
Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'

* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
  b/2367020 Enable bt profiles by default for car dock.
This commit is contained in:
Michael Chan
2010-01-12 13:45:36 -08:00
committed by Android Git Automerger
parent 00d2476d8f d69a5ee28c
commit 07723b5966
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];
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;