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

Commit dea1cbe0 authored by Bryan Eyler's avatar Bryan Eyler Committed by android-build-merger
Browse files

Merge "Darken car status bar." into oc-mr1-dev

am: d1b4848d

Change-Id: I6c7823369750a66395d2af85ef1841b5818ba2c7
parents 0047534b d1b4848d
Loading
Loading
Loading
Loading
+0 −20
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 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.
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android">
    <shape>
        <solid android:color="?android:attr/colorPrimaryDark"/>
    </shape>
</inset>
+5 −4
Original line number Original line Diff line number Diff line
@@ -18,9 +18,10 @@
    android:id="@+id/quick_settings_container"
    android:id="@+id/quick_settings_container"
    android:layout_width="match_parent"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_height="wrap_content"
    android:background="@drawable/car_qs_background_primary"
    android:background="@color/car_qs_background_primary"
    android:orientation="vertical"
    android:orientation="vertical"
    android:elevation="4dp">
    android:elevation="4dp"
    android:theme="@android:style/Theme">


    <include layout="@layout/car_status_bar_header"/>
    <include layout="@layout/car_status_bar_header"/>
    <include layout="@layout/car_qs_footer"/>
    <include layout="@layout/car_qs_footer"/>
+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@
 */
 */
-->
-->
<resources>
<resources>
    <color name="car_qs_background_primary">#263238</color> <!-- Blue Gray 900 -->
    <color name="car_user_switcher_progress_bgcolor">#00000000</color> <!-- Transparent -->
    <color name="car_user_switcher_progress_bgcolor">#00000000</color> <!-- Transparent -->
    <color name="car_user_switcher_progress_fgcolor">#80CBC4</color> <!-- Teal 200 -->
    <color name="car_user_switcher_progress_fgcolor">#80CBC4</color> <!-- Teal 200 -->
    <color name="car_user_switcher_no_user_image_bgcolor">#FAFAFA</color> <!-- Grey 50 -->
    <color name="car_user_switcher_no_user_image_bgcolor">#FAFAFA</color> <!-- Grey 50 -->