From ee66a6d0d26aab7bf4748f90f7082a4e8238901d Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Thu, 27 Jan 2022 09:53:29 +0000
Subject: [PATCH] [Output Switcher] Upadte text string

update text string for stop button from "Stop" to "Stop casting"

Test: verified on device
Bug: 216193358
Change-Id: Id3511f055f31532b85299dd6f398118d808cc0f0
(cherry picked from commit cacf8d0ba13ad50c32d0997236b5b6c6f1246a03)
Merged-In: Id3511f055f31532b85299dd6f398118d808cc0f0
---
 packages/SystemUI/res/layout/media_output_dialog.xml          | 2 +-
 packages/SystemUI/res/values/strings.xml                      | 2 ++
 .../android/systemui/media/dialog/MediaOutputBaseDialog.java  | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/media_output_dialog.xml b/packages/SystemUI/res/layout/media_output_dialog.xml
index 51211a0c0d2a5..05343e75b448f 100644
--- a/packages/SystemUI/res/layout/media_output_dialog.xml
+++ b/packages/SystemUI/res/layout/media_output_dialog.xml
@@ -129,7 +129,7 @@
             style="@style/Widget.Dialog.Button.BorderButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/keyboard_key_media_stop"
+            android:text="@string/media_output_dialog_button_stop_casting"
             android:visibility="gone"/>
 
         <Space
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9e1f57bbfa754..b5e8ec7150732 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2223,6 +2223,8 @@
     <string name="media_output_dialog_launch_app_text">To cast this session, please open the app.</string>
     <!-- App name when can't get app name [CHAR LIMIT=60] -->
     <string name="media_output_dialog_unknown_launch_app_name">Unknown app</string>
+    <!-- Button text for stopping casting [CHAR LIMIT=60] -->
+    <string name="media_output_dialog_button_stop_casting">Stop casting</string>
 
 
     <!-- Label for clip data when copying the build number off QS [CHAR LIMIT=NONE]-->
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
index 04a324b87382b..355c69f9a48d6 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
@@ -211,10 +211,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
                 ColorFilter buttonColorFilter = new PorterDuffColorFilter(
                         mAdapter.getController().getColorButtonBackground(),
                         PorterDuff.Mode.SRC_IN);
-                ColorFilter onlineButtonColorFilter = new PorterDuffColorFilter(
-                        mAdapter.getController().getColorInactiveItem(), PorterDuff.Mode.SRC_IN);
                 mDoneButton.getBackground().setColorFilter(buttonColorFilter);
-                mStopButton.getBackground().setColorFilter(onlineButtonColorFilter);
+                mStopButton.getBackground().setColorFilter(buttonColorFilter);
             }
             mHeaderIcon.setVisibility(View.VISIBLE);
             mHeaderIcon.setImageIcon(icon);