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

Commit 98af2e2e authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4380-Q-Fix_encryption_page_color_issue' into 'v1-q' 

4380-Q-Fix_encryption_page_color_issue

See merge request !85
parents 5e510ac0 d0a105fc

res/values-night-v27/themes.xml

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ 
        <item name="android:windowLightStatusBar">false</item>

    </style>



    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">

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

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

    </style>



    <style name="FallbackHome" parent="@style/FallbackHome.Base">

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

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

res/values-v27/themes.xml

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
        <item name="android:windowLightStatusBar">true</item>

    </style>



    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">

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

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

    </style>



    <style name="FallbackHome" parent="@style/FallbackHome.Base">

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

res/values/themes.xml

+2 −15
Original line number Diff line number Diff line
@@ -133,28 +133,15 @@ 
        <item name="android:minWidth">@dimen/min_tap_target_size</item>

    </style>



    <style name="Theme.CryptKeeper.Base" parent="@android:style/Theme.Material.NoActionBar">

    <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">

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

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

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

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@android:color/black</item>



        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>



        <item name="colorPrimary">@color/color_default_primary</item>

        <item name="colorPrimaryDark">@color/color_default_primary_dark</item>

        <item name="colorAccent">@color/color_default_accent</item>

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

        <item name="android:colorBackground">@color/color_default_background</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>

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

        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>

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

    </style>



    <style name="Theme.CryptKeeper" parent="@style/Theme.CryptKeeper.Base">

    </style>



    <style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">

        <item name="android:windowSoftInputMode">adjustResize</item>