From b8dd637887606242c5cbeaa2fa952946f9013d8f Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 8 Nov 2011 14:21:53 -0800 Subject: [PATCH] Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662 Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba --- src/com/android/settings/DockSettings.java | 2 ++ src/com/android/settings/bluetooth/DockEventReceiver.java | 2 ++ src/com/android/settings/bluetooth/DockService.java | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/src/com/android/settings/DockSettings.java b/src/com/android/settings/DockSettings.java index 3b3402f7cca..1d3e2dd32c1 100644 --- a/src/com/android/settings/DockSettings.java +++ b/src/com/android/settings/DockSettings.java @@ -107,6 +107,8 @@ public class DockSettings extends SettingsPreferenceFragment { resId = R.string.dock_audio_summary_car; break; 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; break; case Intent.EXTRA_DOCK_STATE_UNDOCKED: diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java index d18348f7c86..a3b6b3ca2ae 100644 --- a/src/com/android/settings/bluetooth/DockEventReceiver.java +++ b/src/com/android/settings/bluetooth/DockEventReceiver.java @@ -68,6 +68,8 @@ public final class DockEventReceiver extends BroadcastReceiver { case Intent.EXTRA_DOCK_STATE_UNDOCKED: case Intent.EXTRA_DOCK_STATE_CAR: 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); i.setClass(context, DockService.class); beginStartingService(context, i); diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java index f0644c3714f..943c3f92a46 100644 --- a/src/com/android/settings/bluetooth/DockService.java +++ b/src/com/android/settings/bluetooth/DockService.java @@ -438,6 +438,8 @@ public final class DockService extends Service implements ServiceListener { msgType = MSG_TYPE_UNDOCKED_TEMPORARY; break; 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: if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) { msgType = MSG_TYPE_SHOW_UI; @@ -463,6 +465,8 @@ public final class DockService extends Service implements ServiceListener { switch (state) { case Intent.EXTRA_DOCK_STATE_CAR: case Intent.EXTRA_DOCK_STATE_DESK: + case Intent.EXTRA_DOCK_STATE_LE_DESK: + case Intent.EXTRA_DOCK_STATE_HE_DESK: break; default: return; @@ -578,6 +582,8 @@ public final class DockService extends Service implements ServiceListener { int numOfProfiles; switch (state) { case Intent.EXTRA_DOCK_STATE_DESK: + case Intent.EXTRA_DOCK_STATE_LE_DESK: + case Intent.EXTRA_DOCK_STATE_HE_DESK: numOfProfiles = 1; break; case Intent.EXTRA_DOCK_STATE_CAR: @@ -609,6 +615,8 @@ public final class DockService extends Service implements ServiceListener { break; 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); mProfiles[0] = mProfileManager.getA2dpProfile(); if (firstTime) {