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

Commit d603bf04 authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Consolidate the title rendering and focus manipulation. 

Flag: EXEMPT refactor
Bug: 387570618
Test: atest SystemUIGoogleRoboRNGTests:MediaOutputAdapterScreenshotTest,
    atest SystemUiRoboTests:MediaOutputAdapterTest
Change-Id: I220d4c4f342afd1872caaf1a884017ac1f934cdc
parent 4288dae2

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

+3 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 


        assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mContainerLayout.isFocusable()).isTrue();

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mTitleText.getText().toString()).isEqualTo(TEST_DEVICE_NAME_1);
@@ -924,6 +925,8 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mSeekBar.getContentDescription()).isNotNull();

        assertThat(mViewHolder.mContainerLayout.isFocusable()).isFalse();

        assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE);

        assertThat(mViewHolder.mEndTouchArea.getVisibility()).isEqualTo(View.VISIBLE);

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java

+18 −55
Original line number Diff line number Diff line
@@ -195,15 +195,11 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }

            mItemLayout.setVisibility(View.VISIBLE);

            mStatusIcon.setVisibility(View.GONE);

            enableFocusPropertyForView(mContainerLayout);



            if (mController.isAnyDeviceTransferring()) {

                if (device.getState() == MediaDeviceState.STATE_CONNECTING

                        && !mController.hasAdjustVolumeUserRestriction()) {

                    connectionState = ConnectionState.CONNECTING;

                    setSingleLineLayout(device.getName());

                } else {

                    setSingleLineLayout(device.getName());

                }

            } else {

                // Set different layout for each device
@@ -213,7 +209,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    restrictVolumeAdjustment = true;

                    mCurrentActivePosition = position;

                    updateFullItemClickListener(v -> onItemClick(v, device));

                    setSingleLineLayout(device.getName());

                } else if (mShouldGroupSelectedMediaItems

                        && mController.getSelectedMediaDevice().size() > 1

                        && isDeviceIncluded(mController.getSelectedMediaDevice(), device)) {
@@ -222,11 +217,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        return;

                    } else {

                        isDeviceGroup = true;

                        String sessionName = mController.getSessionName().toString();

                        disableFocusPropertyForView(mContainerLayout);

                        setUpContentDescriptionForView(mSeekBar, mContext.getString(

                                R.string.accessibility_cast_name, sessionName));

                        setSingleLineLayout(sessionName);

                    }

                } else if (device.hasSubtext()) {

                    boolean isActiveWithOngoingSession =
@@ -237,8 +227,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        updateContentAlpha(DEVICE_CONNECTED_ALPHA);

                        ongoingSessionStatus = new OngoingSessionStatus(

                                device.isHostForOngoingSession());

                        setTwoLineLayout(device.getName() /* title */,

                                true /* showSubtitle */, false /* showStatus */);

                        setSubtextAndStatus(true /* showSubtitle */, false /* showStatus */);

                        connectionState = ConnectionState.CONNECTED;

                    } else {

                        if (currentlyConnected) {
@@ -258,28 +247,21 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        updateContentAlpha(

                                updateClickActionBasedOnSelectionBehavior(device)

                                        ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                        setTwoLineLayout(device.getName(),

                                true /* showSubtitle */,

                        setSubtextAndStatus(true /* showSubtitle */,

                                deviceStatusIcon != null /* showStatus */);

                    }

                } else if (device.getState() == MediaDeviceState.STATE_CONNECTING_FAILED) {

                    updateConnectionFailedStatusIcon();

                    mSubTitleText.setText(R.string.media_output_dialog_connect_failed);

                    updateFullItemClickListener(v -> onItemClick(v, device));

                    setTwoLineLayout(device.getName(),

                            true /* showSubtitle */,

                            true /* showStatus */);

                    setSubtextAndStatus(true /* showSubtitle */, true /* showStatus */);

                } else if (device.getState() == MediaDeviceState.STATE_GROUPING) {

                    connectionState = ConnectionState.CONNECTING;

                    setSingleLineLayout(device.getName());

                } else if (mController.getSelectedMediaDevice().size() > 1 && isSelected) {

                    // selected device in group

                    groupStatus = new GroupStatus(

                            true /* selected */,

                            isDeselectable /* deselectable */);

                    disableFocusPropertyForView(mContainerLayout);

                    setUpContentDescriptionForView(mSeekBar, device);

                    setSingleLineLayout(device.getName());

                    connectionState = ConnectionState.CONNECTED;

                } else if (!mController.hasAdjustVolumeUserRestriction()

                        && currentlyConnected) {
@@ -288,12 +270,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            && !mController.isCurrentConnectedDeviceRemote()) {

                        // mark as disconnected and set special click listener

                        updateFullItemClickListener(v -> cancelMuteAwaitConnection());

                        setSingleLineLayout(device.getName());

                    } else if (device.hasOngoingSession()) {

                        mCurrentActivePosition = position;

                        ongoingSessionStatus = new OngoingSessionStatus(

                                device.isHostForOngoingSession());

                        setSingleLineLayout(device.getName());

                        connectionState = ConnectionState.CONNECTED;

                    } else if (mController.isCurrentConnectedDeviceRemote()

                            && !mController.getSelectableMediaDevice().isEmpty()) {
@@ -302,15 +282,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        groupStatus = new GroupStatus(

                                true /* selected */,

                                isDeselectable /* isDeselectable */);

                        disableFocusPropertyForView(mContainerLayout);

                        setUpContentDescriptionForView(mSeekBar, device);

                        setSingleLineLayout(device.getName());

                        connectionState = ConnectionState.CONNECTED;

                    } else {

                        disableFocusPropertyForView(mContainerLayout);

                        setUpContentDescriptionForView(mSeekBar, device);

                        mCurrentActivePosition = position;

                        setSingleLineLayout(device.getName());

                        connectionState = ConnectionState.CONNECTED;

                    }

                } else if (isSelectable) {
@@ -321,9 +295,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            || hasRouteListingPreferenceItem) {

                        updateFullItemClickListener(v -> onItemClick(v, device));

                    }

                    setSingleLineLayout(device.getName());

                } else {

                    setSingleLineLayout(device.getName());

                    Drawable deviceStatusIcon =

                            device.hasOngoingSession() ? mContext.getDrawable(

                                    R.drawable.ic_sound_bars_anim)
@@ -341,13 +313,17 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }



            if (isDeviceGroup) {

                String sessionName = mController.getSessionName().toString();

                updateTitle(sessionName);

                updateUnmutedVolumeIcon(null /* device */);

                updateGroupSeekBar();

                updateGroupSeekBar(getGroupItemContentDescription(sessionName));

                updateEndAreaForDeviceGroup();

                updateItemBackground(ConnectionState.CONNECTED);

            } else {

                updateTitle(device.getName());

                updateTitleIcon(device, connectionState, restrictVolumeAdjustment);

                updateSeekBar(device, connectionState, restrictVolumeAdjustment);

                updateSeekBar(device, connectionState, restrictVolumeAdjustment,

                        getDeviceItemContentDescription(device));

                updateEndArea(device, connectionState, groupStatus, ongoingSessionStatus);

                updateLoadingIndicator(connectionState);

                updateItemBackground(connectionState);
@@ -433,8 +409,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                ((AnimatedVectorDrawable) drawable).start();

            }

            if (Flags.enableOutputSwitcherSessionGrouping()) {

                setUpContentDescriptionForView(

                        mEndClickIcon, mContext.getString(accessibilityStringId));

                mEndClickIcon.setContentDescription(mContext.getString(accessibilityStringId));

            }

        }
@@ -474,7 +449,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            mEndTouchArea.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);

            updateEndAreaColor(groupStatus.selected() ? mController.getColorSeekbarProgress()

                    : mController.getColorItemBackground());

            setUpContentDescriptionForView(mEndTouchArea, device);

            mEndTouchArea.setContentDescription(getDeviceItemContentDescription(device));

            mCheckBox.setChecked(groupStatus.selected());

            mCheckBox.setOnCheckedChangeListener(

                    isEnabled ? (buttonView, isChecked) -> onGroupActionTriggered(
@@ -492,7 +467,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
        void onBindPairNewDevice() {

            mTitleText.setTextColor(mController.getColorItemContent());

            mCheckBox.setVisibility(View.GONE);

            setSingleLineLayout(mContext.getText(R.string.media_output_dialog_pairing_new));

            updateTitle(mContext.getText(R.string.media_output_dialog_pairing_new));

            updateItemBackground(ConnectionState.DISCONNECTED);

            final Drawable addDrawable = mContext.getDrawable(R.drawable.ic_add);

            mTitleIcon.setImageDrawable(addDrawable);
@@ -547,27 +522,15 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            notifyDataSetChanged();

        }



        private void disableFocusPropertyForView(View view) {

            view.setFocusable(false);

            view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

        }



        private void enableFocusPropertyForView(View view) {

            view.setFocusable(true);

            view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

        }



        private void setUpContentDescriptionForView(View view, @NonNull MediaDevice device) {

            setUpContentDescriptionForView(

                    view,

                    mContext.getString(device.getDeviceType()

                            == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE

        private String getDeviceItemContentDescription(@NonNull MediaDevice device) {

            return mContext.getString(

                    device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE

                            ? R.string.accessibility_bluetooth_name

                            : R.string.accessibility_cast_name, device.getName()));

                            : R.string.accessibility_cast_name, device.getName());

        }



        protected void setUpContentDescriptionForView(View view, String description) {

            view.setContentDescription(description);

        private String getGroupItemContentDescription(String sessionName) {

            return mContext.getString(R.string.accessibility_cast_name, sessionName);

        }

    }

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java

+21 −5
Original line number Diff line number Diff line
@@ -195,14 +195,15 @@ public abstract class MediaOutputBaseAdapter extends 
            mIconAreaLayout.setBackground(null);

            mSeekBar.setProgressTintList(

                    ColorStateList.valueOf(mController.getColorSeekbarProgress()));

            enableFocusPropertyForView(mContainerLayout);

        }



        void setSingleLineLayout(CharSequence title) {

        void updateTitle(CharSequence title) {

            mTitleText.setText(title);

        }



        void updateSeekBar(@NonNull MediaDevice device, ConnectionState connectionState,

                boolean restrictVolumeAdjustment) {

                boolean restrictVolumeAdjustment, String contentDescription) {

            boolean showSeekBar =

                    connectionState == ConnectionState.CONNECTED && !restrictVolumeAdjustment;

            if (!mCornerAnimator.isRunning()) {
@@ -214,20 +215,35 @@ public abstract class MediaOutputBaseAdapter extends 
            mSeekBar.setVisibility(showSeekBar ? View.VISIBLE : View.GONE);

            if (showSeekBar) {

                initSeekbar(device, isCurrentSeekbarInvisible);

                disableFocusPropertyForView(mContainerLayout);

                mSeekBar.setContentDescription(contentDescription);

            } else {

                enableFocusPropertyForView(mContainerLayout);

            }

        }



        void updateGroupSeekBar() {

        void updateGroupSeekBar(String contentDescription) {

            updateSeekbarProgressBackground();

            boolean isCurrentSeekbarInvisible = mSeekBar.getVisibility() == View.GONE;

            mSeekBar.setVisibility(View.VISIBLE);

            initGroupSeekbar(isCurrentSeekbarInvisible);

            disableFocusPropertyForView(mContainerLayout);

            mSeekBar.setContentDescription(contentDescription);

        }



        private void disableFocusPropertyForView(View view) {

            view.setFocusable(false);

            view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

        }



        void setTwoLineLayout(CharSequence title, boolean showSubtitle, boolean showStatus) {

        private void enableFocusPropertyForView(View view) {

            view.setFocusable(true);

            view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

        }



        void setSubtextAndStatus(boolean showSubtitle, boolean showStatus) {

            mStatusIcon.setVisibility(showStatus ? View.VISIBLE : View.GONE);

            mSubTitleText.setVisibility(showSubtitle ? View.VISIBLE : View.GONE);

            mTitleText.setText(title);

        }



        protected void updateLoadingIndicator(ConnectionState connectionState) {