diff options
| author | hughchen <hughchen@google.com> | 2018-05-18 12:27:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-18 12:27:08 -0700 |
| commit | a2a26442eb262c8195f5d70bd20c877224a4ea6c (patch) | |
| tree | b2103335985cc5bab5b2131bf5de5275671c8d4f /src/com/android/settings/sound | |
| parent | cf0e76b4cf97d66cafa84f1cef3d85c4637d8d7a (diff) | |
| parent | 30539223408148a25dd94caedf9abc6167571203 (diff) | |
| download | packages_apps_Settings-a2a26442eb262c8195f5d70bd20c877224a4ea6c.tar.gz packages_apps_Settings-a2a26442eb262c8195f5d70bd20c877224a4ea6c.tar.bz2 packages_apps_Settings-a2a26442eb262c8195f5d70bd20c877224a4ea6c.zip | |
Merge "Update UI when BT device is rename" into pi-dev am: 77d218ab72
am: 3053922340
Change-Id: I86bd3be4f017f5bd80a2308a5b1e99366027a476
Diffstat (limited to 'src/com/android/settings/sound')
3 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index e0c8c88252..44e4aa8b64 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -136,7 +136,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont final BluetoothDevice btDevice = mConnectedDevices.get(connectedDeviceIndex); mSelectedIndex = connectedDeviceIndex; setActiveBluetoothDevice(btDevice); - listPreference.setSummary(btDevice.getName()); + listPreference.setSummary(btDevice.getAliasName()); } return true; } @@ -328,7 +328,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont mediaValues[mSelectedIndex] = mContext.getText(R.string.media_output_default_summary); for (int i = 0, size = mConnectedDevices.size(); i < size; i++) { final BluetoothDevice btDevice = mConnectedDevices.get(i); - mediaOutputs[i] = btDevice.getName(); + mediaOutputs[i] = btDevice.getAliasName(); mediaValues[i] = btDevice.getAddress(); if (btDevice.equals(activeDevice)) { // select the active connected device. diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index 0115de7288..fdbf610802 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -66,7 +66,11 @@ public class HandsFreeProfileOutputPreferenceController extends if (numDevices == 0) { // No connected devices, disable switch entry. mPreference.setVisible(false); - preference.setSummary(mContext.getText(R.string.media_output_default_summary)); + final CharSequence summary = mContext.getText(R.string.media_output_default_summary); + final CharSequence[] defaultMediaOutput = new CharSequence[]{summary}; + mSelectedIndex = getDefaultDeviceIndex(); + preference.setSummary(summary); + setPreference(defaultMediaOutput, defaultMediaOutput, preference); return; } diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index 9c3bc4c130..bf9e37f903 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -78,7 +78,11 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro if (numDevices == 0) { // Disable switch entry if there is no connected devices. mPreference.setVisible(false); - preference.setSummary(mContext.getText(R.string.media_output_default_summary)); + final CharSequence summary = mContext.getText(R.string.media_output_default_summary); + final CharSequence[] defaultMediaOutput = new CharSequence[]{summary}; + mSelectedIndex = getDefaultDeviceIndex(); + preference.setSummary(summary); + setPreference(defaultMediaOutput, defaultMediaOutput, preference); return; } |