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

Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1

Browse Source
This commit is contained in:
Jeff Brown
2011-11-08 17:22:02 -08:00
committed by Android (Google) Code Review
parent 2215abe996 b8dd637887
commit 81dfecf8ba
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DockSettings.java
View File

@@ -107,6 +107,8 @@ public class DockSettings extends SettingsPreferenceFragment {
resId = R.string.dock_audio_summary_car; resId = R.string.dock_audio_summary_car;
break; break;
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
resId = R.string.dock_audio_summary_desk; resId = R.string.dock_audio_summary_desk;
break; break;
case Intent.EXTRA_DOCK_STATE_UNDOCKED: case Intent.EXTRA_DOCK_STATE_UNDOCKED:

2
src/com/android/settings/bluetooth/DockEventReceiver.java
View File

@@ -68,6 +68,8 @@ public final class DockEventReceiver extends BroadcastReceiver {
case Intent.EXTRA_DOCK_STATE_UNDOCKED: case Intent.EXTRA_DOCK_STATE_UNDOCKED:
case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_CAR:
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
Intent i = new Intent(intent); Intent i = new Intent(intent);
i.setClass(context, DockService.class); i.setClass(context, DockService.class);
beginStartingService(context, i); beginStartingService(context, i);

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

@@ -438,6 +438,8 @@ public final class DockService extends Service implements ServiceListener {
msgType = MSG_TYPE_UNDOCKED_TEMPORARY; msgType = MSG_TYPE_UNDOCKED_TEMPORARY;
break; break;
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_CAR:
if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) { if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) {
msgType = MSG_TYPE_SHOW_UI; msgType = MSG_TYPE_SHOW_UI;
@@ -463,6 +465,8 @@ public final class DockService extends Service implements ServiceListener {
switch (state) { switch (state) {
case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_CAR:
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
break; break;
default: default:
return; return;
@@ -578,6 +582,8 @@ public final class DockService extends Service implements ServiceListener {
int numOfProfiles; int numOfProfiles;
switch (state) { switch (state) {
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
numOfProfiles = 1; numOfProfiles = 1;
break; break;
case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_CAR:
@@ -609,6 +615,8 @@ public final class DockService extends Service implements ServiceListener {
break; break;
case Intent.EXTRA_DOCK_STATE_DESK: case Intent.EXTRA_DOCK_STATE_DESK:
case Intent.EXTRA_DOCK_STATE_LE_DESK:
case Intent.EXTRA_DOCK_STATE_HE_DESK:
items[0] = getString(R.string.bluetooth_dock_settings_a2dp); items[0] = getString(R.string.bluetooth_dock_settings_a2dp);
mProfiles[0] = mProfileManager.getA2dpProfile(); mProfiles[0] = mProfileManager.getA2dpProfile();
if (firstTime) { if (firstTime) {