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

Commit ee703887 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix QS edit BGs" into nyc-dev

parents 88353459 57af5e33
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/system_secondary_color" />
    <corners
        android:topLeftRadius="0dp"
        android:topRightRadius="0dp" />
</shape>
+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@color/qs_detail_transition" />
    <item android:drawable="?android:attr/windowBackground" />
    <item android:drawable="@color/system_primary_color" />
</transition>
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
    <color name="batterymeter_bolt_color">#FFFFFFFF</color>
    <color name="qs_batterymeter_frame_color">#FF404040</color>
    <color name="system_primary_color">#ff263238</color><!-- blue grey 900 -->
    <color name="system_secondary_color">#ff384248</color>
    <color name="system_secondary_color">#ff37474F</color><!-- blue grey 800 -->
    <color name="system_accent_color">#ff80CBC4</color><!-- deep teal 200 -->
    <color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
    <color name="qs_text">#FFFFFFFF</color>