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

Commit a1dcfe8f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use device_suggestion_container instead of device_suggestion_button as... 

Merge "Use device_suggestion_container instead of device_suggestion_button as the clickable surface for device suggestions button in UMO" into main
parents b9fb7577 99c8d99f

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+6 −5
Original line number Diff line number Diff line
@@ -701,19 +701,20 @@ public class MediaControlPanel { 
    }



    private void setSuggestionClickListener(SuggestedMediaDeviceData suggestionData) {

        ViewGroup deviceSuggestionContainer = mMediaViewHolder.getDeviceSuggestionContainer();

        int connectionState = suggestionData.getConnectionState();

        if (connectionState == MediaDeviceState.STATE_DISCONNECTED

                || connectionState == MediaDeviceState.STATE_CONNECTING_FAILED) {

            mMediaViewHolder.getDeviceSuggestionButton().setClickable(true);

            mMediaViewHolder

                    .getDeviceSuggestionButton()



            deviceSuggestionContainer.setClickable(true);

            deviceSuggestionContainer

                    .setOnClickListener(

                            v -> {

                                suggestionData.getConnect().invoke();

                            });

        } else {

            mMediaViewHolder.getDeviceSuggestionButton().setOnClickListener(null);

            mMediaViewHolder.getDeviceSuggestionButton().setClickable(false);

            deviceSuggestionContainer.setOnClickListener(null);

            deviceSuggestionContainer.setClickable(false);

        }

    }

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    private lateinit var multiRippleView: MultiRippleView

    private lateinit var turbulenceNoiseView: TurbulenceNoiseView

    private lateinit var loadingEffectView: LoadingEffectView

    @Mock private lateinit var deviceSuggestionContainer: ViewGroup

    private lateinit var deviceSuggestionContainer: ViewGroup

    private lateinit var deviceSuggestionText: TextView

    private lateinit var deviceSuggestionIcon: ImageView

    private lateinit var deviceSuggestionConnectingIcon: ProgressBar
@@ -377,7 +377,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        multiRippleView = MultiRippleView(context, null)

        turbulenceNoiseView = TurbulenceNoiseView(context, null)

        loadingEffectView = LoadingEffectView(context, null)



        deviceSuggestionContainer = FrameLayout(context)

        deviceSuggestionText = TextView(context)

        deviceSuggestionIcon = ImageView(context)

        deviceSuggestionConnectingIcon = ProgressBar(context)
@@ -1215,7 +1215,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
            .isEqualTo(mContext.getString(R.string.media_suggestion_disconnected_text, DEVICE_NAME))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionConnectingIcon.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionButton.isClickable).isTrue()

        assertThat(deviceSuggestionContainer.isClickable).isTrue()

    }



    @Test
@@ -1237,7 +1237,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
            .isEqualTo(mContext.getString(R.string.media_suggestion_disconnected_text, DEVICE_NAME))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionConnectingIcon.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionButton.isClickable).isFalse()

        assertThat(deviceSuggestionContainer.isClickable).isFalse()

    }



    @Test
@@ -1259,7 +1259,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
            .isEqualTo(mContext.getString(R.string.media_suggestion_failure_text))

        assertThat(deviceSuggestionIcon.visibility).isEqualTo(View.VISIBLE)

        assertThat(deviceSuggestionConnectingIcon.visibility).isEqualTo(View.GONE)

        assertThat(deviceSuggestionButton.isClickable).isTrue()

        assertThat(deviceSuggestionContainer.isClickable).isTrue()

    }



    @Test