Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Partial Screensharing] Rename start button id

Browse Source 
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
This commit is contained in:
yyalan
2023-04-24 16:49:43 +01:00
committed by Yalan Yiue
parent 66a64d2303
commit 4e1ed613bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/screen_share_dialog.xml
View File

@@ -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"

4
packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt
View File

@@ -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())