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

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

Merge "RequestManageCredentials dark theme" into sc-dev

parents 73a806fa dce68bf7

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ 
        </activity>



        <activity android:name=".security.RequestManageCredentials"

                  android:theme="@style/Theme.RequestManageCredentials"

                  android:theme="@style/Theme.SubSettings"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.security.MANAGE_CREDENTIALS"/>

res/layout/request_manage_credentials.xml

+4 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:clipChildren="true">



    <RelativeLayout

        android:layout_width="match_parent"
@@ -70,6 +71,7 @@ 
        app:elevation="3dp"

        app:icon="@drawable/ic_arrow_downward"

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

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

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

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



</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ 
        <item name="android:paddingBottom">8dp</item>

        <item name="android:orientation">horizontal</item>

        <item name="android:layout_alignParentBottom">true</item>

        <item name="android:background">?android:colorBackground</item>

    </style>



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

res/values/themes.xml

+0 −15
Original line number Diff line number Diff line
@@ -165,21 +165,6 @@ 
        <item name="android:colorAccent">@*android:color/white</item>

    </style>



    <style name="Theme.RequestManageCredentials" parent="@style/Theme.MaterialComponents.Light">

        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>



        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>

        <item name="colorAccent">@*android:color/accent_device_default_light</item>

        <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>



        <item name="android:windowBackground">@android:color/white</item>

        <item name="android:statusBarColor">@android:color/white</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:navigationBarColor">@android:color/white</item>

    </style>



    <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:colorBackgroundCacheHint">@null</item>