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

Commit 98b17305 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

Eleven: Inherit from Material3 themes 

Change-Id: I0a1118361127832a805a1e466905f91c12333af7
parent d7b422ba

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ android_app { 
        "androidx.palette_palette",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.viewpager2_viewpager2"

        "androidx.viewpager2_viewpager2",

        "com.google.android.material_material",

    ],



    overrides: ["Music"],

res/values-night/styles.xml

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

<!--

     Copyright (C) 2021 The LineageOS 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.

-->

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

    <!-- Main Material -->

    <style name="Eleven.Theme" parent="@style/Theme.AppCompat.NoActionBar">

        <item name="android:windowContentOverlay">@null</item>

        <item name="popupMenuStyle">@style/PopupMenu</item>

        <item name="dropDownListViewStyle">@style/DropDownListView</item>

        <item name="textAppearanceSmallPopupMenu">@style/SmallPopupMenu</item>

        <item name="textAppearanceLargePopupMenu">@style/LargePopupMenu</item>

        <item name="android:listViewStyle">@style/ListView</item>

        <item name="actionBarStyle">@style/ActionBar</item>

        <item name="actionBarWidgetTheme">@style/ActionBarWidgetTheme</item>

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

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

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

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

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

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

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

    </style>



    <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat" />

</resources>

res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">

    <!-- Main Material -->

    <style name="Eleven.Theme" parent="@style/Theme.AppCompat.Light.NoActionBar">

    <style name="Eleven.Theme" parent="@style/Theme.Material3.DayNight.NoActionBar">

        <item name="android:windowContentOverlay">@null</item>

        <item name="popupMenuStyle">@style/PopupMenu</item>

        <item name="dropDownListViewStyle">@style/DropDownListView</item>
@@ -38,7 +38,7 @@ 
        <item name="android:windowLightNavigationBar">true</item>

    </style>



    <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.DayNight">

    <style name="ActionBarWidgetTheme" parent="@style/Theme.Material3.DayNight">

        <!-- This is the color of the search text hint in the action bar -->

        <item name="android:textColorHint">@color/search_hint_color</item>

        <item name="popupMenuStyle">@style/PopupMenu</item>
@@ -178,7 +178,7 @@ 
        <item name="colorControlNormal">@color/white</item>

    </style>



    <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat.Light" />

    <style name="ToolBarPopupTheme" parent="Theme.Material3.DayNight" />



    <style name="Eleven.Theme.PopupMenuOverlapAnchor">

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