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

Commit 31b02a61 authored by Ned Burns's avatar Ned Burns Committed by Android (Google) Code Review
Browse files

Merge changes from topic "gentle-header" into qt-dev 

* changes:
  Add "clear all" button to gentle notif section header
  Add "Gentle Notifications" header to gentle section
parents cd58d5a5 61269441

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

0 → 100644
+25 −0
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

0 → 100644
+25 −0
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="#5F6368"

        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

0 → 100644
+66 −0
Original line number Diff line number Diff line 
<!--

  ~ 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

  -->



<!-- Extends FrameLayout -->

<com.android.systemui.statusbar.notification.stack.SectionHeaderView

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_section_header_height"

    android:focusable="true"

    android:clickable="true"

    >

    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundNormal"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundDimmed"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:orientation="horizontal"

        >

        <TextView

            android:id="@+id/header_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginLeft="@dimen/notification_section_header_padding_left"

            android:text="@string/notification_section_header_gentle"

            android:textSize="12sp"

            android:textColor="@color/notification_section_header_label_color"

            />

        <ImageView

            android:id="@+id/btn_clear_all"

            android:layout_width="@dimen/notification_section_header_height"

            android:layout_height="@dimen/notification_section_header_height"

            android:layout_marginRight="4dp"

            android:src="@drawable/status_bar_notification_section_header_clear_btn"

            android:contentDescription="@string/accessibility_notification_section_header_gentle_clear_all"

            />

    </LinearLayout>



    <com.android.systemui.statusbar.notification.FakeShadowView

        android:id="@+id/fake_shadow"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



</com.android.systemui.statusbar.notification.stack.SectionHeaderView>

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

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
    <color name="notification_guts_header_text_color">@color/GM2_grey_200</color>

    <color name="notification_guts_button_color">@color/GM2_blue_200</color>



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



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

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

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ 
    <color name="notification_alert_color">#FFF87B2B</color>

    <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="assist_orb_color">#ffffff</color>



    <color name="keyguard_user_switcher_background_gradient_color">#77000000</color>