From 4e1ed613bf60f2defb59ffa18a25e9e8853f7ae8 Mon Sep 17 00:00:00 2001
From: yyalan <yyalan@google.com>
Date: Mon, 24 Apr 2023 16:49:43 +0100
Subject: [Partial Screensharing] Rename start button id

Rename start button id to android:id/button1 so that CTS test could work for both with and without PSS (where AlertDialog is used)

HSV: https://screenshot.googleplex.com/7JDQNXDTFPp6Voo.png

Fixes: 264853338
Test: atest CtsMediaProjectionTestCases:MediaProjectionTest
Change-Id: I642f91d9d91c10fb4248a5eb02f92d9c523e00e9
---
 packages/SystemUI/res/layout/screen_share_dialog.xml                  | 4 ++--
 .../android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/screen_share_dialog.xml b/packages/SystemUI/res/layout/screen_share_dialog.xml
index bd719894e25f..6c823c10c4bd 100644
--- a/packages/SystemUI/res/layout/screen_share_dialog.xml
+++ b/packages/SystemUI/res/layout/screen_share_dialog.xml
@@ -76,7 +76,7 @@
             android:orientation="horizontal"
             android:layout_marginTop="@dimen/screenrecord_buttons_margin_top">
             <TextView
-                android:id="@+id/button_cancel"
+                android:id="@android:id/button2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -87,7 +87,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"/>
             <TextView
-                android:id="@+id/button_start"
+                android:id="@android:id/button1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt
index f63bf07a5a3f..b34004397520 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt
@@ -57,8 +57,8 @@ open class BaseScreenSharePermissionDialog(
         setContentView(R.layout.screen_share_dialog)
         dialogTitle = findViewById(R.id.screen_share_dialog_title)
         warning = findViewById(R.id.text_warning)
-        startButton = findViewById(R.id.button_start)
-        cancelButton = findViewById(R.id.button_cancel)
+        startButton = findViewById(android.R.id.button1)
+        cancelButton = findViewById(android.R.id.button2)
         updateIcon()
         initScreenShareOptions()
         createOptionsView(getOptionsViewLayoutId())
-- 
cgit v1.2.3-59-g8ed1b