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

Merge "[Partial Screensharing] Rename start button id" into udc-dev am: 4a2870ce2a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22597857

Change-Id: Ie63f00353d0c74cf82370c21c573a64cae3f1e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yalan Yiue
2023-04-27 13:39:30 +00:00
committed by Automerger Merge Worker
parent c3919b99b1 4a2870ce2a
commit a13cf89668
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:orientation="horizontal"
android:layout_marginTop="@dimen/screenrecord_buttons_margin_top"> android:layout_marginTop="@dimen/screenrecord_buttons_margin_top">
<TextView <TextView
android:id="@+id/button_cancel" android:id="@android:id/button2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
@@ -87,7 +87,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:id="@+id/button_start" android:id="@android:id/button1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" 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) setContentView(R.layout.screen_share_dialog)
dialogTitle = findViewById(R.id.screen_share_dialog_title) dialogTitle = findViewById(R.id.screen_share_dialog_title)
warning = findViewById(R.id.text_warning) warning = findViewById(R.id.text_warning)
startButton = findViewById(R.id.button_start) startButton = findViewById(android.R.id.button1)
cancelButton = findViewById(R.id.button_cancel) cancelButton = findViewById(android.R.id.button2)
updateIcon() updateIcon()
initScreenShareOptions() initScreenShareOptions()
createOptionsView(getOptionsViewLayoutId()) createOptionsView(getOptionsViewLayoutId())