Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81dfecf8 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents 2215abe9 b8dd6378

src/com/android/settings/DockSettings.java

+2 −0
Original line number Diff line number Diff line
@@ -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:

src/com/android/settings/bluetooth/DockEventReceiver.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/bluetooth/DockService.java

+8 −0
Original line number Diff line number Diff line
@@ -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) {