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

Commit 016da6b2 authored by shaoweishen's avatar shaoweishen Committed by Shaowei Shen
Browse files

[Output Swithcer] Fix deeplink and disable single device layout 

Fix deeplink launch new instance of application.
Fix layout doesn't gray out for single disabled device.

Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest
Bug: 270561143
Bug: 270561507
Change-Id: I850d43eb9bec4b3b85f574059d32bd08f0d6022a
(cherry picked from commit 58ad605d)
parent 60348db3

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            updateDeviceStatusIcon(deviceStatusIcon);

                            updateDeviceStatusIcon(deviceStatusIcon);

                            mStatusIcon.setVisibility(View.VISIBLE);

                            mStatusIcon.setVisibility(View.VISIBLE);

                        }

                        }

                        updateTwoLineLayoutContentAlpha(

                        updateSingleLineLayoutContentAlpha(

                                updateClickActionBasedOnSelectionBehavior(device)

                                updateClickActionBasedOnSelectionBehavior(device)

                                        ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                                        ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                    } else {

                    } else {
@@ -364,6 +364,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            mStatusIcon.setAlpha(alphaValue);

            mStatusIcon.setAlpha(alphaValue);

        }

        }





        private void updateSingleLineLayoutContentAlpha(float alphaValue) {

            mTitleIcon.setAlpha(alphaValue);

            mTitleText.setAlpha(alphaValue);

            mStatusIcon.setAlpha(alphaValue);

        }



        private void updateEndClickAreaAsSessionEditing(MediaDevice device) {

        private void updateEndClickAreaAsSessionEditing(MediaDevice device) {

            mEndClickIcon.setOnClickListener(null);

            mEndClickIcon.setOnClickListener(null);

            mEndTouchArea.setOnClickListener(null);

            mEndTouchArea.setOnClickListener(null);

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -395,7 +395,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
            launchIntent.putExtra(EXTRA_ROUTE_ID, routeId);

            launchIntent.putExtra(EXTRA_ROUTE_ID, routeId);

            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            mCallback.dismissDialog();

            mCallback.dismissDialog();

            mContext.startActivity(launchIntent);

            mActivityStarter.startActivity(launchIntent, true, controller);

            mActivityStarter.startActivity(launchIntent, true, controller);

        }

        }

    }

    }