mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-23 20:48:43 +00:00
Fix mixed theme use when system force dark is on.
Thanks to flodo from the forum for the help.
This commit is contained in:
committed by
Greyson Parrelli
parent
f6b46f921c
commit
e97a1b2cf6
@@ -3,6 +3,7 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<style name="Signal.Transparent" parent="Theme.AppCompat">
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
@@ -89,6 +90,7 @@
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
@@ -99,6 +101,7 @@
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
@@ -126,6 +129,7 @@
|
||||
|
||||
<style name="TextSecure.BaseLightTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
|
||||
<item name="theme_type">light</item>
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
|
||||
<item name="search_view_style">@style/Signal.SearchView</item>
|
||||
|
||||
@@ -180,6 +184,7 @@
|
||||
|
||||
<style name="TextSecure.BaseDarkTheme" parent="@style/Theme.MaterialComponents.Bridge">
|
||||
<item name="theme_type">dark</item>
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
|
||||
<item name="search_view_style">@style/Signal.SearchView</item>
|
||||
|
||||
@@ -311,6 +316,7 @@
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkTheme.WebRTCCall">
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
|
||||
<item name="android:statusBarColor" tools:ignore="NewApi">@color/core_ultramarine</item>
|
||||
<item name="android:windowActionBar">false</item>
|
||||
<item name="android:windowTranslucentStatus">true</item>
|
||||
|
||||
Reference in New Issue
Block a user