From 016da6b2b449e81f024df1bb04fd130822faf5cb Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Fri, 24 Feb 2023 11:30:12 +0000
Subject: [PATCH] [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 58ad605d89dcd605791c9685a8b8768ac6bd4bbd)
---
 .../android/systemui/media/dialog/MediaOutputAdapter.java | 8 +++++++-
 .../systemui/media/dialog/MediaOutputController.java      | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
index 6cf297c4885cb..9928c4f79a967 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
@@ -340,7 +340,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
                             updateDeviceStatusIcon(deviceStatusIcon);
                             mStatusIcon.setVisibility(View.VISIBLE);
                         }
-                        updateTwoLineLayoutContentAlpha(
+                        updateSingleLineLayoutContentAlpha(
                                 updateClickActionBasedOnSelectionBehavior(device)
                                         ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);
                     } else {
@@ -364,6 +364,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
             mStatusIcon.setAlpha(alphaValue);
         }
 
+        private void updateSingleLineLayoutContentAlpha(float alphaValue) {
+            mTitleIcon.setAlpha(alphaValue);
+            mTitleText.setAlpha(alphaValue);
+            mStatusIcon.setAlpha(alphaValue);
+        }
+
         private void updateEndClickAreaAsSessionEditing(MediaDevice device) {
             mEndClickIcon.setOnClickListener(null);
             mEndTouchArea.setOnClickListener(null);
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
index 84dc2851b56c9..f3f17d1c7144c 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -395,7 +395,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
             launchIntent.putExtra(EXTRA_ROUTE_ID, routeId);
             launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             mCallback.dismissDialog();
-            mContext.startActivity(launchIntent);
             mActivityStarter.startActivity(launchIntent, true, controller);
         }
     }