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

Commit df93be45 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[Screen share] UX tweaks to the screen share & cast permission dialogs." into main

parents 0a258191 22a41bca

packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
        <Button

            android:id="@android:id/button1"

            style="?android:attr/buttonBarPositiveButtonStyle"

            android:layout_marginStart="8dp"

            android:layout_marginStart="@dimen/dialog_button_side_margin"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

    </com.android.internal.widget.ButtonBarLayout>

packages/SystemUI/res/layout/screen_share_dialog.xml

+5 −8
Original line number Diff line number Diff line
@@ -64,30 +64,27 @@ 
            android:layout_height="wrap_content"

            android:text="@string/screenrecord_permission_dialog_warning_entire_screen"

            style="@style/TextAppearance.Dialog.Body.Message"

            android:gravity="start"/>

            android:gravity="start"

            android:textAlignment="gravity"/>



        <!-- Buttons -->

        <com.android.internal.widget.ButtonBarLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layout_marginTop="@dimen/screenrecord_buttons_margin_top">

            android:layout_marginTop="@dimen/screenrecord_buttons_margin_top"

            android:gravity="end">

            <Button

                android:id="@android:id/button2"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="0"

                android:text="@string/cancel"

                style="@style/Widget.Dialog.Button.BorderButton" />

            <Space

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"/>

            <Button

                android:id="@android:id/button1"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="0"

                android:layout_marginStart="@dimen/dialog_button_side_margin"

                android:text="@string/screenrecord_continue"

                style="@style/Widget.Dialog.Button" />

        </com.android.internal.widget.ButtonBarLayout>

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -1751,6 +1751,7 @@ 


    <!-- System UI Dialog -->

    <dimen name="dialog_title_text_size">24sp</dimen>

    <dimen name="dialog_button_side_margin">8dp</dimen>



    <!-- Internet panel related dimensions -->

    <dimen name="internet_dialog_list_max_height">662dp</dimen>