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

Commit b2313604 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Fix colors in importance and conversation priority preferences

This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.

On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!

Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
parent 42339b4e
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@
  limitations under the License.
  -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
       android:shape="rectangle">
    <solid
        android:color="?attr/notification_importance_button_background_color_selected"/>
    <stroke
        android:width="1dp"
        android:color="?androidprv:attr/materialColorOutlineVariant"/>
        android:color="?attr/notification_importance_button_border_color_selected"/>
    <corners android:radius="@dimen/rect_button_radius" />
</shape>
+2 −3
Original line number Diff line number Diff line
@@ -15,12 +15,11 @@
  limitations under the License.
  -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
       android:shape="rectangle">
    <solid
        android:color="?androidprv:attr/materialColorSecondaryContainer" />
        android:color="?attr/notification_importance_button_background_color_unselected"/>
    <stroke
        android:width="1dp"
        android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>
        android:color="?attr/notification_importance_button_border_color_unselected"/>
    <corners android:radius="@dimen/rect_button_radius" />
</shape>
+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@
        <item name="android:colorBackground">@*android:color/surface_dark</item>
    </style>

    <style name="Theme.Panel.Material" parent="Theme.Panel" >
        <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
        <item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_dark</item>
        <item name="notification_importance_button_foreground_color_unselected">@android:color/system_on_surface_variant_dark</item>

        <item name="notification_importance_button_background_color_selected">@android:color/system_secondary_container_dark</item>
        <item name="notification_importance_button_border_color_selected">@android:color/system_on_secondary_container_dark</item>
        <item name="notification_importance_button_foreground_color_selected">@android:color/system_on_secondary_container_dark</item>
    </style>

    <!-- Material theme for the pages containing TabLayout and ViewPager -->
    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>
+8 −0
Original line number Diff line number Diff line
@@ -194,4 +194,12 @@
        <attr name="biometricsEnrollProgressHelp" format="reference|color" />
        <attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" />
    </declare-styleable>

    <attr name="notification_importance_button_background_color_unselected" format="color" />
    <attr name="notification_importance_button_border_color_unselected" format="color" />
    <attr name="notification_importance_button_foreground_color_unselected" format="color" />

    <attr name="notification_importance_button_background_color_selected" format="color" />
    <attr name="notification_importance_button_border_color_selected" format="color" />
    <attr name="notification_importance_button_foreground_color_selected" format="color" />
</resources>
+20 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@
     limitations under the License.
-->

<resources>
<resources
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <style name="Transparent">
        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
@@ -66,6 +67,14 @@

        <!-- For slice view in settings -->
        <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>

        <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
        <item name="notification_importance_button_border_color_unselected">?androidprv:attr/materialColorOutlineVariant</item>
        <item name="notification_importance_button_foreground_color_unselected">?androidprv:attr/materialColorOnSurfaceVariant</item>

        <item name="notification_importance_button_background_color_selected">?androidprv:attr/materialColorSecondaryContainer</item>
        <item name="notification_importance_button_border_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
        <item name="notification_importance_button_foreground_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
    </style>

    <!-- Variant of the settings theme with no action bar. -->
@@ -231,7 +240,16 @@

    <style name="Theme.Panel.Material" parent="Theme.Panel">
        <item name="android:switchStyle">@style/Switch.SettingsLib</item>

        <item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
        <item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_light</item>
        <item name="notification_importance_button_foreground_color_unselected">@android:color/system_on_surface_variant_light</item>

        <item name="notification_importance_button_background_color_selected">@android:color/system_secondary_container_light</item>
        <item name="notification_importance_button_border_color_selected">@android:color/system_on_secondary_container_light</item>
        <item name="notification_importance_button_foreground_color_selected">@android:color/system_on_secondary_container_light</item>
    </style>

    <!-- Material theme for the pages containing TabLayout and ViewPager -->
    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
        <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
Loading