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

Commit 6bd36094 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update "Add user" dialog appearance" into main

parents 47888701 79beb3be

packages/SettingsLib/res/drawable/dialog_btn_filled.xml

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

            <shape android:shape="rectangle">

                <corners android:radius="@dimen/button_corner_radius"/>

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

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

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

                         android:top="@dimen/dialog_button_vertical_padding"

                         android:right="@dimen/dialog_button_horizontal_padding"

packages/SettingsLib/res/drawable/dialog_btn_outline.xml

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

                <corners android:radius="@dimen/button_corner_radius"/>

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

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

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

                        android:width="1dp"/>

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

                         android:top="@dimen/dialog_button_vertical_padding"

packages/SettingsLib/res/layout/dialog_with_icon.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<ScrollView

    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_height="match_parent"

    android:id="@+id/new_user_dialog_id">
@@ -30,6 +31,7 @@ 
            android:id="@+id/dialog_with_icon_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/dialog_with_icon_title"

packages/SettingsLib/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 


    <style name="DialogButtonPositive">

        <item name="android:background">@drawable/dialog_btn_filled</item>

        <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textSize">14sp</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>

packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ public class CustomDialogHelper { 
     * //TODO: modify method to allow setting state for any button.

     */

    public CustomDialogHelper setButtonEnabled(boolean enabled) {

        if (enabled) {

            mPositiveButton.setAlpha(1f);

        } else {

            mPositiveButton.setAlpha(0.5f);

        }

        mPositiveButton.setEnabled(enabled);

        return this;

    }