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

Commit 5031ef65 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Notification guts redesign" into qt-dev am: 388f6726 

am: 915d5cbe

Change-Id: I9afe280b79cc63e6eed9482b0cba6308cdba48bb
parents af5c7194 915d5cbe

packages/SystemUI/res/drawable/button_border_selected.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.

  -->

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

       android:shape="rectangle">

    <solid

        android:color="@color/notification_guts_selection_bg" />

    <stroke

        android:width="2dp"

        android:color="?android:attr/colorAccent"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/button_border_unselected.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.

  -->

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

       android:shape="rectangle"

       android:color="@color/notification_guts_selection_bg">

    <stroke

        android:width="2dp"

        android:color="@color/GM2_grey_300"/>



    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/button_ripple_radius.xml

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

  -->

<ripple

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

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

            <corners android:radius="@dimen/rect_button_radius" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_notification_gentle.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@ Copyright (C) 2019 The Android Open Source Project 
        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@color/GM2_green_500" />

                android:color="@color/notification_silence_color" />

            <size

                android:height="36dp"

                android:width="36dp"/>

                android:height="24dp"

                android:width="24dp"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

                android:width="32dp"

                android:height="32dp"

                android:width="13dp"

                android:height="13dp"

                android:viewportWidth="24"

                android:viewportHeight="24">

            <path

packages/SystemUI/res/drawable/ic_notification_interruptive.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ Copyright (C) 2019 The Android Open Source Project 
        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@color/GM2_yellow_500" />

                android:color="@color/notification_alert_color" />

            <size

                android:height="36dp"

                android:width="36dp"/>

                android:height="24dp"

                android:width="24dp"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

                android:width="32dp"

                android:height="32dp"

                android:width="13dp"

                android:height="13dp"

                android:viewportWidth="24"

                android:viewportHeight="24">

            <path