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

Commit 5f7750d7 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Use colorSecondary for darker bg color. 

Used for widget headers and a few other places.

In order to support pre-API 25, an app-local version of colorSecondary
is created and used throughout the app. A new WidgetContainerTheme
sets colorSecondary to a canned value. On API 25+, colorSecondary
is set to the platform value.

Change-Id: Ie0dd66333052b7346eea5d82d1c88417c6a2cd00
Fixes: 28625102
parent 26def237

res/drawable/quantum_panel_shape_dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->

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

       android:shape="rectangle">

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

    <solid android:color="?attr/colorSecondary" />

    <corners

        android:radius="2dp" />

</shape>

res/drawable/widgets_row_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->

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

    <size android:width="@dimen/widget_row_divider" />

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

    <solid android:color="?attr/colorSecondary" />

</shape>

res/layout/widgets_list_row_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:id="@+id/section"

        android:layout_width="match_parent"

        android:layout_height="@dimen/widget_section_height"

        android:background="@color/quantum_panel_bg_color_dark"

        android:background="?attr/colorSecondary"

        android:drawablePadding="@dimen/widget_section_horizontal_padding"

        android:ellipsize="end"

        android:focusable="true"

res/layout/widgets_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:paddingBottom="@dimen/container_bounds_inset"

    android:descendantFocusability="afterDescendants"

    launcher:revealBackground="@drawable/quantum_panel_shape_dark"

    android:theme="@android:style/Theme.DeviceDefault.Settings">

    android:theme="@style/WidgetContainerTheme">



    <View

        android:id="@+id/reveal_view"

res/values-v25/styles.xml

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

<!--

/*

* Copyright (C) 2016 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.

*/

-->

<resources>

    <!-- Theme for the widget container. -->

    <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="colorSecondary">?android:attr/colorSecondary</item>

    </style>

</resources>