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

Commit c575b2df authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add support for user-selectable dark/light theme"

parents 1a95d1de 893b3006

res/drawable/preference_background.xml

+2 −6
Original line number Diff line number Diff line
@@ -14,9 +14,5 @@ 
     limitations under the License.

-->



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

    android:inset="0dip">



    <color android:color="?android:attr/colorBackground" />



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

       android:color="?android:attr/colorBackground" />

res/layout/dashboard_category.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:paddingStart="@dimen/dashboard_category_padding_start"

        android:paddingEnd="@dimen/dashboard_category_padding_end"

        android:orientation="vertical"

        android:background="@android:color/white"

        android:background="@color/card_background"

        android:layout_marginBottom="8dip"

        android:elevation="@dimen/dashboard_category_elevation">

res/layout/settings_main_dashboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
             android:id="@+id/main_content"

             android:layout_height="match_parent"

             android:layout_width="match_parent"

             android:background="@color/dashboard_background_color"

             android:background="?android:attr/colorBackground"

             />

res/values-night/colors.xml

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

<resources>

    <color name="card_background">#ff424242</color>

</resources>
 
 No newline at end of file

res/values/arrays.xml

+22 −0
Original line number Diff line number Diff line
@@ -1288,4 +1288,26 @@ 
        <item>midi</item>

    </string-array>



    <!-- Possible values for user theme in Display Settings.

         Do not translate. -->

    <string-array name="night_mode_entries" translatable="false">

        <!-- Do not translate. -->

        <item>@string/night_mode_no</item>

        <!-- Do not translate. -->

        <item>@string/night_mode_yes</item>

        <!-- Do not translate. -->

        <item>@string/night_mode_auto</item>

    </string-array>



    <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.

         Do not translate. -->

    <string-array name="night_mode_values" translatable="false">

        <!-- Do not translate. -->

        <item>1</item>

        <!-- Do not translate. -->

        <item>2</item>

        <!-- Do not translate. -->

        <item>0</item>

    </string-array>



</resources>