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

Commit cf5bb135 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "RequestManageCredentials Material Next Spec" into sc-dev

parents 17101d6e 848a388a

res/layout-land/request_manage_credentials.xml

+3 −2
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
                        <Button

                            android:id="@+id/allow_button"

                            style="@style/RequestManageCredentialsAllowButton"

                            android:theme="@style/RoundedCornerButtonTheme"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text="@string/request_manage_credentials_allow" />
@@ -123,10 +124,10 @@ 
                    android:layout_height="wrap_content"

                    android:text="@string/request_manage_credentials_more"

                    android:theme="@style/Theme.CollapsingToolbar.Settings"

                    app:backgroundTint="?android:attr/colorPrimary"

                    app:backgroundTint="?android:attr/colorAccent"

                    app:elevation="3dp"

                    app:icon="@drawable/ic_arrow_downward"

                    app:iconTint="?android:attr/colorAccent"

                    app:iconTint="?android:attr/textColorPrimary"

                    app:layout_anchor="@id/apps_list"

                    app:layout_anchorGravity="bottom|center" />

res/layout/request_manage_credentials.xml

+3 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
            <Button

                android:id="@+id/allow_button"

                style="@style/RequestManageCredentialsAllowButton"

                android:theme="@style/RoundedCornerButtonTheme"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/request_manage_credentials_allow"/>
@@ -70,8 +71,8 @@ 
        app:layout_anchorGravity="bottom|center"

        app:elevation="3dp"

        app:icon="@drawable/ic_arrow_downward"

        app:iconTint="?android:attr/colorAccent"

        app:backgroundTint="?android:attr/colorPrimary"

        app:iconTint="?android:attr/textColorPrimary"

        app:backgroundTint="?android:attr/colorAccent"

        android:theme="@style/Theme.CollapsingToolbar.Settings"/>



</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values/styles.xml

+11 −2
Original line number Diff line number Diff line
@@ -800,10 +800,19 @@ 
        <item name="android:background">?android:colorBackground</item>

    </style>



    <style name="RoundedCornerButtonTheme">

        <item name="android:buttonCornerRadius">50dp</item>

        <item name="android:paddingStart">20dp</item>

        <item name="android:paddingEnd">20dp</item>

        <item name="android:paddingTop">18dp</item>

        <item name="android:paddingBottom">18dp</item>

    </style>



    <style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton">

        <item name="android:fontFamily">google-sans-medium</item>

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

        <item name="android:textAllCaps">false</item>

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

    </style>



    <style name="RequestManageCredentialsDontAllowButton"
@@ -811,13 +820,13 @@ 
        <item name="android:fontFamily">google-sans-medium</item>

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

        <item name="android:textAllCaps">false</item>

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

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

    </style>



    <style name="RequestManageCredentialsFab">

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

        <item name="android:textAllCaps">false</item>

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

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

        <item name="android:layout_marginBottom">12dp</item>

    </style>