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

Commit fd5f585f authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Fabián Kozynski
Browse files

Dialog color tokens 

Test: manual, open dialogs that use base theme
Test: open screen record dialog
Fixes: 278574288

Change-Id: I1e664cfd34b9befc01811925f6c2cf33f8d45a7e
parent c268174c

packages/SystemUI/res/drawable/qs_dialog_btn_filled.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
        <item>

        <item>

            <shape android:shape="rectangle">

            <shape android:shape="rectangle">

                <corners android:radius="?android:attr/buttonCornerRadius"/>

                <corners android:radius="?android:attr/buttonCornerRadius"/>

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

                <solid android:color="?androidprv:attr/materialColorPrimary"/>

                <padding android:left="@dimen/dialog_button_horizontal_padding"

                <padding android:left="@dimen/dialog_button_horizontal_padding"

                         android:top="@dimen/dialog_button_vertical_padding"

                         android:top="@dimen/dialog_button_vertical_padding"

                         android:right="@dimen/dialog_button_horizontal_padding"

                         android:right="@dimen/dialog_button_horizontal_padding"

packages/SystemUI/res/drawable/qs_dialog_btn_filled_large.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <item>

    <item>

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

            <corners android:radius="18dp"/>

            <corners android:radius="18dp"/>

            <solid android:color="?androidprv:attr/colorAccentPrimary"/>

            <solid android:color="?androidprv:attr/materialColorPrimaryFixed"/>

        </shape>

        </shape>

    </item>

    </item>

</ripple>
 
</ripple>

packages/SystemUI/res/drawable/qs_dialog_btn_outline.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
            <shape android:shape="rectangle">

            <shape android:shape="rectangle">

                <corners android:radius="?android:attr/buttonCornerRadius"/>

                <corners android:radius="?android:attr/buttonCornerRadius"/>

                <solid android:color="@android:color/transparent"/>

                <solid android:color="@android:color/transparent"/>

                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"

                <stroke android:color="?androidprv:attr/materialColorPrimary"

                        android:width="1dp"

                        android:width="1dp"

                />

                />

                <padding android:left="@dimen/dialog_button_horizontal_padding"

                <padding android:left="@dimen/dialog_button_horizontal_padding"

packages/SystemUI/res/layout/alert_dialog_title_systemui.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ 
            android:layout_marginBottom="16dp"

            android:layout_marginBottom="16dp"

            android:scaleType="fitCenter"

            android:scaleType="fitCenter"

            android:src="@null"

            android:src="@null"

            android:tint="?androidprv:attr/colorAccentPrimaryVariant"

            android:tint="?androidprv:attr/materialColorPrimary"

            />

            />





        <TextView

        <TextView

packages/SystemUI/res/layout/screen_record_dialog.xml

+5 −4
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
  limitations under the License.

  limitations under the License.

  -->

  -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:orientation="vertical">
@@ -47,7 +48,7 @@ 
                <TextView

                <TextView

                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:textAppearance="?android:attr/textAppearanceLarge"

                    android:textAppearance="@style/TextAppearance.Dialog.Title"

                    android:fontFamily="@*android:string/config_headlineFontFamily"

                    android:fontFamily="@*android:string/config_headlineFontFamily"

                    android:text="@string/screenrecord_permission_dialog_title"

                    android:text="@string/screenrecord_permission_dialog_title"

                    android:layout_marginTop="22dp"

                    android:layout_marginTop="22dp"
@@ -56,8 +57,7 @@ 
                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/screenrecord_permission_dialog_warning_entire_screen"

                    android:text="@string/screenrecord_permission_dialog_warning_entire_screen"

                    android:textAppearance="?android:attr/textAppearanceSmall"

                    android:textAppearance="@style/TextAppearance.Dialog.Body.Message"

                    android:textColor="?android:textColorSecondary"

                    android:gravity="center"

                    android:gravity="center"

                    android:layout_marginBottom="20dp"/>

                    android:layout_marginBottom="20dp"/>
@@ -81,6 +81,7 @@ 
                        android:minHeight="48dp"

                        android:minHeight="48dp"

                        android:layout_weight="1"

                        android:layout_weight="1"

                        android:popupBackground="@drawable/screenrecord_spinner_background"

                        android:popupBackground="@drawable/screenrecord_spinner_background"

                        android:textColor="?androidprv:attr/materialColorOnSurface"

                        android:dropDownWidth="274dp"

                        android:dropDownWidth="274dp"

                        android:prompt="@string/screenrecord_audio_label"/>

                        android:prompt="@string/screenrecord_audio_label"/>

                    <Switch

                    <Switch
@@ -117,7 +118,7 @@ 
                        android:text="@string/screenrecord_taps_label"

                        android:text="@string/screenrecord_taps_label"

                        android:textAppearance="?android:attr/textAppearanceMedium"

                        android:textAppearance="?android:attr/textAppearanceMedium"

                        android:fontFamily="@*android:string/config_headlineFontFamily"

                        android:fontFamily="@*android:string/config_headlineFontFamily"

                        android:textColor="?android:attr/textColorPrimary"

                        android:textColor="?androidprv:attr/materialColorOnSurface"

                        android:importantForAccessibility="no"/>

                        android:importantForAccessibility="no"/>

                    <Switch

                    <Switch

                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"