Merge "Hide the audio switcher if it is not relevant" into pi-dev am: 3f5444b9e4 (8118c8d7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/sound/AudioSwitchPreferenceController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreference = screen.findPreference(mPreferenceKey);
		mPreference.setVisible(false);
		}

		@Override

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public class HandsFreeProfileOutputPreferenceController extends

		if (!isOngoingCallStatus()) {
		// Without phone call, disable the switch entry.
		preference.setEnabled(false);
		mPreference.setVisible(false);
		preference.setSummary(mContext.getText(R.string.media_output_default_summary));
		return;
		}
		@@ -67,12 +67,12 @@ public class HandsFreeProfileOutputPreferenceController extends
		final int numDevices = ArrayUtils.size(mConnectedDevices);
		if (numDevices == 0) {
		// No connected devices, disable switch entry.
		preference.setEnabled(false);
		mPreference.setVisible(false);
		preference.setSummary(mContext.getText(R.string.media_output_default_summary));
		return;
		}

		preference.setEnabled(true);
		mPreference.setVisible(true);
		CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
		CharSequence[] mediaValues = new CharSequence[numDevices + 1];

src/com/android/settings/sound/MediaOutputPreferenceController.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -52,14 +52,14 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro

		if (isStreamFromOutputDevice(STREAM_MUSIC, DEVICE_OUT_REMOTE_SUBMIX)) {
		// In cast mode, disable switch entry.
		preference.setEnabled(false);
		mPreference.setVisible(false);
		preference.setSummary(mContext.getText(R.string.media_output_summary_unavailable));
		return;
		}

		if (isOngoingCallStatus()) {
		// Ongoing call status, switch entry for media will be disabled.
		preference.setEnabled(false);
		mPreference.setVisible(false);
		preference.setSummary(
		mContext.getText(R.string.media_out_summary_ongoing_call_state));
		return;
		@@ -79,12 +79,12 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
		final int numDevices = ArrayUtils.size(mConnectedDevices);
		if (numDevices == 0) {
		// Disable switch entry if there is no connected devices.
		preference.setEnabled(false);
		mPreference.setVisible(false);
		preference.setSummary(mContext.getText(R.string.media_output_default_summary));
		return;
		}

		preference.setEnabled(true);
		mPreference.setVisible(true);
		CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
		CharSequence[] mediaValues = new CharSequence[numDevices + 1];

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ public class AudioOutputSwitchPreferenceControllerTest {

		@Override
		public String getPreferenceKey() {
		return null;
		return TEST_KEY;
		}
		}
		}
		No newline at end of file

tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest {

		/**
		* One Headset Bluetooth device is available and activated
		* Preference should be enabled
		* Preference should be visible
		* Preference summary should be activate device name
		*/
		@Test
		@@ -170,13 +170,13 @@ public class HandsFreeProfileOutputPreferenceControllerTest {

		mController.updateState(mPreference);

		assertThat(mPreference.isEnabled()).isTrue();
		assertThat(mPreference.isVisible()).isTrue();
		assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());
		}

		/**
		* More than one Headset Bluetooth devices are available, and second device is active.
		* Preference should be enabled
		* Preference should be visible
		* Preference summary should be activate device name
		*/
		@Test
		@@ -196,14 +196,14 @@ public class HandsFreeProfileOutputPreferenceControllerTest {

		mController.updateState(mPreference);

		assertThat(mPreference.isEnabled()).isTrue();
		assertThat(mPreference.isVisible()).isTrue();
		assertThat(mPreference.getSummary()).isEqualTo(secondBluetoothDevice.getName());
		}

		/**
		* Hands Free Profile Bluetooth device(s) are available, but wired headset is plugged in
		* and activated.
		* Preference should be enabled
		* Preference should be visible
		* Preference summary should be "This device"
		*/
		@Test
		@@ -216,14 +216,14 @@ public class HandsFreeProfileOutputPreferenceControllerTest {

		mController.updateState(mPreference);

		assertThat(mPreference.isEnabled()).isTrue();
		assertThat(mPreference.isVisible()).isTrue();
		assertThat(mPreference.getSummary()).isEqualTo(
		mContext.getText(R.string.media_output_default_summary));
		}

		/**
		* No available Headset BT devices
		* Preference should be disabled
		* Preference should be invisible
		* Preference summary should be "This device"
		*/
		@Test
		@@ -234,7 +234,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest {

		mController.updateState(mPreference);

		assertThat(mPreference.isEnabled()).isFalse();
		assertThat(mPreference.isVisible()).isFalse();
		assertThat(mPreference.getSummary()).isEqualTo(
		mContext.getText(R.string.media_output_default_summary));
		}