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

Commit 5268219d authored by Nishith Khanna's avatar Nishith Khanna
Browse files

SettingsLib: Theme according to our palette 

Themes various elements in settings app like spinner, dropdown menu, tabs, switch, etc
Changes reference for colors in compose to our colors to better match palette
parent 045c7998

packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
       xmlns:tools="http://schemas.android.com/tools"

       tools:targetApi="28"

       android:shape="rectangle">

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh" />

    <solid android:color="@color/settingslib_state_on_color"/>

    <corners

        android:topLeftRadius="?android:attr/dialogCornerRadius"

        android:topRightRadius="0dp"

packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
       xmlns:tools="http://schemas.android.com/tools"

       tools:targetApi="28"

       android:shape="rectangle">

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh" />

    <solid android:color="@color/settingslib_state_on_color" />

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="?android:attr/dialogCornerRadius"

packages/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<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:color/materialColorSurfaceContainerHigh" />

    <solid android:color="@color/settingslib_state_on_color" />

    <corners

        android:radius="0dp"

    />

packages/SettingsLib/ActionButtonsPreference/res/layout-v33/settingslib_action_buttons.xml

+4 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


    <Button

        android:id="@+id/button1"

        style="@style/SettingsLibActionButton"

        android:drawableTint="@*android:color/e_accent"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -42,7 +42,7 @@ 


    <Button

        android:id="@+id/button2"

        style="@style/SettingsLibActionButton"

        android:drawableTint="@*android:color/e_accent"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -59,7 +59,7 @@ 


    <Button

        android:id="@+id/button3"

        style="@style/SettingsLibActionButton"

        android:drawableTint="@*android:color/e_accent"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -76,6 +76,7 @@ 


    <Button

        android:id="@+id/button4"

        android:drawableTint="@*android:color/e_accent"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

packages/SettingsLib/MainSwitchPreference/res/color-night-v34/settingslib_main_switch_text_color.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2023 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false"

          android:color="@android:color/system_accent1_100"

          android:alpha="?android:attr/disabledAlpha" />

    <item android:color="@android:color/system_accent1_100"/>

</selector>
 
 No newline at end of file