diff options
3 files changed, 35 insertions, 2 deletions
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java index 3d16d6f1cd56..c387d48b33da 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java @@ -507,4 +507,25 @@ public class MediaDeviceTest { assertThat(mPhoneMediaDevice.getSelectionBehavior()).isEqualTo( SELECTION_BEHAVIOR_TRANSFER); } + + @Test + public void getSelectionBehavior_withRouteListingPreferenceItem_returnPreferenceBehavior() { + mItem = + new RouteListingPreference.Item.Builder(DEVICE_ADDRESS_1) + .setSelectionBehavior(SELECTION_BEHAVIOR_GO_TO_APP) + .build(); + MediaDevice castMediaDevice = new ComplexMediaDevice(mContext, mRouteInfo1, mItem); + + assertThat(castMediaDevice.hasRouteListingPreferenceItem()).isTrue(); + assertThat(castMediaDevice.getSelectionBehavior()).isEqualTo(SELECTION_BEHAVIOR_GO_TO_APP); + } + + @Test + public void getSelectionBehavior_withoutRouteListingPreferenceItem_returnTransfer() { + MediaDevice castMediaDevice = + new ComplexMediaDevice(mContext, mRouteInfo1, /* item= */ null); + + assertThat(castMediaDevice.hasRouteListingPreferenceItem()).isFalse(); + assertThat(castMediaDevice.getSelectionBehavior()).isEqualTo(SELECTION_BEHAVIOR_TRANSFER); + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacyTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacyTest.java index 2db2199602b8..8dff20eeb80a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacyTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacyTest.java @@ -778,6 +778,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_ACTIVE_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); @@ -799,6 +801,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_ACTIVE_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); @@ -820,6 +824,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_ACTIVE_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); @@ -841,6 +847,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_ACTIVE_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); @@ -862,6 +870,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_ACTIVE_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); @@ -883,6 +893,8 @@ public class MediaOutputAdapterLegacyTest extends SysuiTestCase { assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_2); + assertThat(mViewHolder.mTitleText.getAlpha()) + .isEqualTo(MediaOutputAdapterLegacy.DEVICE_DISABLED_ALPHA); assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue(); mViewHolder.mContainerLayout.performClick(); diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java index 300a3578bb8f..290f62f595b1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java @@ -61,8 +61,8 @@ public class MediaOutputAdapterLegacy extends MediaOutputAdapterBase { private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final int UNMUTE_DEFAULT_VOLUME = 2; - private static final float DEVICE_DISABLED_ALPHA = 0.5f; - private static final float DEVICE_ACTIVE_ALPHA = 1f; + @VisibleForTesting static final float DEVICE_DISABLED_ALPHA = 0.5f; + @VisibleForTesting static final float DEVICE_ACTIVE_ALPHA = 1f; View mHolderView; private boolean mIsInitVolumeFirstTime; |