Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a2870ce authored by Yalan Yiue's avatar Yalan Yiue Committed by Android (Google) Code Review
Browse files

Merge "[Partial Screensharing] Rename start button id" into udc-dev

parents 9dcad8dd 4e1ed613

packages/SystemUI/res/layout/screen_share_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/systemui/screenrecord/BaseScreenSharePermissionDialog.kt

+2 −2
Original line number Diff line number Diff line
@@ -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())