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

Commit 52a2737b authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Another redesign of notification guts 

- Separate out the blocking helper layout/logic a bit
more from the standard guts
- Colors! Larger text! big buttons! Persistent descriptions
of the behavior you're choosing
- No more special 'min' logic
- no more inline blocking
- placeholder text for what's shown when multiple channels are
involved
- both 'turn off notifications' and the settings gear currently
go to the same place

Test: atest
Bug: 127992400
Change-Id: I080335fab728c4ac269e093d09c2f6b5ffdaea5e
parent bbc42684

packages/SystemUI/res/drawable/ic_notification_gentle.xml

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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

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

            <size

                android:height="36dp"

                android:width="36dp"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

                android:width="32dp"

                android:height="32dp"

                android:viewportWidth="24"

                android:viewportHeight="24">

            <path

                android:fillColor="#FFFFFFFF"

                android:pathData="M15,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-0.28 -0.22,-0.5 -0.5,-0.5s-0.5,0.22 -0.5,0.5c0,1.38 -1.12,2.5 -2.5,2.5S6.5,13.38 6.5,12c0,-0.28 -0.22,-0.5 -0.5,-0.5c-0.24,0 -0.46,0.18 -0.49,0.42C5.41,12.55 4.89,13 4.27,13H2v-2h1.71C4.1,10.11 5,9.5 6,9.5c1.38,0 2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5c1.02,0 1.91,0.6 2.29,1.5H22v2h-2.27c-0.62,0 -1.14,-0.45 -1.23,-1.08c-0.04,-0.24 -0.25,-0.42 -0.49,-0.42c-0.28,0 -0.5,0.22 -0.5,0.5C17.5,13.38 16.38,14.5 15,14.5z"/>

        </vector>

    </item>

</layer-list>

packages/SystemUI/res/drawable/ic_notification_interruptive.xml

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

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

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

            <size

                android:height="36dp"

                android:width="36dp"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

                android:width="32dp"

                android:height="32dp"

                android:viewportWidth="24"

                android:viewportHeight="24">

            <path

                android:fillColor="#FFFFFFFF"

                android:pathData="M8.98,16.65c-0.47,0 -0.91,-0.27 -1.12,-0.69l-1.93,-4.61L5.46,12.3c-0.21,0.43 -0.64,0.69 -1.12,0.69H2v-2h1.88l1,-2C5.1,8.56 5.52,8.3 6,8.3s0.9,0.26 1.12,0.69l1.73,4.14l2,-7c0.2,-0.46 0.65,-0.76 1.15,-0.76s0.95,0.3 1.15,0.76l0.04,0.12l1.96,6.88l1.7,-4.08c0.49,-0.98 1.84,-0.91 2.26,-0.06l1,2H22v2h-2.35c-0.47,0 -0.91,-0.27 -1.12,-0.7l-0.47,-0.95l-1.9,4.55c-0.25,0.5 -0.69,0.77 -1.18,0.75c-0.48,-0.01 -0.92,-0.31 -1.11,-0.76l-0.04,-0.12L12,9.37l-1.87,6.52c-0.19,0.45 -0.63,0.74 -1.11,0.76C9.01,16.65 9,16.65 8.98,16.65zM20.32,11.4L20.32,11.4C20.32,11.4 20.32,11.4 20.32,11.4z" />

        </vector>

    </item>

</layer-list>

packages/SystemUI/res/layout/notification_info.xml

+205 −207

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 
    <!-- The color of the text inside a notification -->

    <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>



    <color name="notification_guts_selection_bg">#202124</color>

    <color name="notification_guts_selection_border">#669DF6</color>

    <color name="notification_guts_link_icon_tint">@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

+7 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ 
    <!-- The "inside" of a notification, reached via longpress -->

    <color name="notification_guts_bg_color">@color/GM2_grey_50</color>



    <color name="notification_guts_selection_bg">#FFFFFF</color>

    <color name="notification_guts_selection_border">#4285F4</color>

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



    <color name="assist_orb_color">#ffffff</color>



    <color name="keyguard_user_switcher_background_gradient_color">#77000000</color>
@@ -163,4 +167,7 @@ 


    <color name="GM2_red_300">#F28B82</color>

    <color name="GM2_red_500">#B71C1C</color>



    <color name="GM2_yellow_500">#FFFBBC04</color>

    <color name="GM2_green_500">#FF34A853</color>

</resources>