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

Commit 8e42667d authored by Ned Burns's avatar Ned Burns
Browse files

Increase height of silent section header to meet GAR 

Also removes the night-specific layout in favor of a color selector.

Test: manual
Fixes: 132401519
Change-Id: I336aa3e5cf3d4c9b09f8e985d5c1389cd935d7a5
parent 687ee8d6

packages/SystemUI/res/drawable-night/status_bar_notification_section_header_clear_btn.xml

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

<!--

  ~ Copyright (C) 2019 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

  -->

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

        android:width="40dp"

        android:height="40dp"

        android:viewportWidth="40"

        android:viewportHeight="40">

    <path

        android:fillColor="#9AA0A6"

        android:pathData="M24.6667 16.2733L23.7267 15.3333L20 19.06L16.2734 15.3333L15.3334 16.2733L19.06 20L15.3334 23.7266L16.2734 24.6666L20 20.94L23.7267 24.6666L24.6667 23.7266L20.94 20L24.6667 16.2733Z"/>

</vector>

packages/SystemUI/res/drawable/status_bar_notification_section_header_clear_btn.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
    android:viewportWidth="40"

    android:viewportHeight="40">

    <path

        android:fillColor="#5F6368"

        android:fillColor="@color/notification_section_clear_all_btn_color"

        android:pathData="M24.6667 16.2733L23.7267 15.3333L20 19.06L16.2734 15.3333L15.3334 16.2733L19.06 20L15.3334 23.7267L16.2734 24.6667L20 20.94L23.7267 24.6667L24.6667 23.7267L20.94 20L24.6667 16.2733Z"/>

</vector>

packages/SystemUI/res/layout/status_bar_notification_section_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
            android:layout_marginRight="4dp"

            android:src="@drawable/status_bar_notification_section_header_clear_btn"

            android:contentDescription="@string/accessibility_notification_section_header_gentle_clear_all"

            android:scaleType="center"

            />

    </LinearLayout>

packages/SystemUI/res/values-night/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
    <color name="notification_guts_button_color">@color/GM2_blue_200</color>



    <color name="notification_section_header_label_color">@color/GM2_grey_200</color>

    <color name="notification_section_clear_all_btn_color">@color/GM2_grey_500</color>

    <color name="notification_channel_dialog_separator">@color/GM2_grey_700</color>



    <!-- The color of the background in the top part of QSCustomizer -->

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 
    <color name="notification_guts_button_color">@color/GM2_blue_700</color>



    <color name="notification_section_header_label_color">@color/GM2_grey_900</color>

    <color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color>

    <!-- The divider view for the notification channel editor half-shelf -->

    <color name="notification_channel_dialog_separator">@color/GM2_grey_200</color>