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

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

Extract generation of ongoingSession and groupStatus device objects. 

Flag: EXEMPT refactor
Bug: 387570618
Test: atest SystemUiRoboTests:MediaOutputAdapterTest
    atest SystemUIGoogleRoboRNGTests:MediaOutputAdapterScreenshotTest
Change-Id: I459c81556832151da36bb52b9010266ef6233e0a
parent 6ae1c784

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

+21 −16
Original line number Diff line number Diff line
@@ -224,8 +224,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                    } else {

                        isDeviceGroup = true;

                    }

                } else {

                } else { // A connected or disconnected device.

                    subtitle = device.hasSubtext() ? device.getSubtextString() : null;

                    ongoingSessionStatus = getOngoingSessionStatus(device);

                    groupStatus = getGroupStatus(isSelected, isSelectable, isDeselectable);



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

                        deviceStatusIcon = mContext.getDrawable(
@@ -234,22 +236,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                        clickListener = v -> onItemClick(v, device);

                    } else if (currentlyConnected || isSelected) {

                        connectionState = ConnectionState.CONNECTED;

                        // single selected device

                        if (device.hasOngoingSession()) {

                            ongoingSessionStatus = new OngoingSessionStatus(

                                    device.isHostForOngoingSession());

                        }

                        if (hasMultipleSelectedDevices() || hasSelectableDevices()) {

                            //If device is connected and there's other selectable devices, layout as

                            // one of selected devices.

                            groupStatus = new GroupStatus(true /* selected */,

                                    isDeselectable /* isDeselectable */);

                        }

                    } else { // disconnected

                        if (isSelectable) {

                            //groupable device

                            groupStatus = new GroupStatus(false /* selected */,

                                    true /* deselectable */);

                        if (isSelectable) { // groupable device

                            if (!Flags.disableTransferWhenAppsDoNotSupport() || isTransferable

                                    || hasRouteListingPreferenceItem) {

                                clickListener = v -> onItemClick(v, device);
@@ -291,6 +279,23 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }

        }



        private OngoingSessionStatus getOngoingSessionStatus(MediaDevice device) {

            return device.hasOngoingSession() ? new OngoingSessionStatus(

                    device.isHostForOngoingSession()) : null;

        }



        private GroupStatus getGroupStatus(boolean isSelected, boolean isSelectable,

                boolean isDeselectable) {

            // A device should either be selectable or, when the device selected, the list should

            // have other selectable or selected devices.

            boolean selectedWithOtherGroupDevices =

                    isSelected && (hasMultipleSelectedDevices() || hasSelectableDevices());

            if (isSelectable || selectedWithOtherGroupDevices) {

                return new GroupStatus(isSelected, isDeselectable);

            }

            return null;

        }



        private boolean hasMultipleSelectedDevices() {

            return mController.getSelectedMediaDevice().size() > 1;

        }