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

Commit e09fb702 authored by Mady Mellor's avatar Mady Mellor
Browse files

Update snooze visuals to match latest design 

Also updates it so that the height animates going from collapsed / expanded

Test: manual / runtest systemui
Bug: 36249479
Change-Id: Ice10e42986eddc9b87ba79cd00dfc59fefef5464
parent ab312729

packages/SystemUI/res/layout/notification_snooze.xml

+47 −38
Original line number Diff line number Diff line
@@ -19,46 +19,55 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/snooze_snackbar_min_height"

    android:orientation="vertical"

    android:background="@color/notification_guts_bg_color"

    android:theme="@*android:style/Theme.DeviceDefault.Light">



    <RelativeLayout

        android:layout_width="match_parent"

        android:id="@+id/notification_snooze"

    android:clickable="true"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:paddingStart="24dp"

    android:paddingEnd="24dp"

    android:background="@color/snooze_snackbar_bg">

        android:layout_height="@dimen/snooze_snackbar_min_height">



        <TextView

            android:id="@+id/snooze_option_default"

        style="@style/TextAppearance.SnoozeSnackBar"

            android:layout_width="wrap_content"

       	android:layout_height="match_parent"

       	android:gravity="center_vertical"

      	android:drawableTint="@android:color/white"

       	android:drawableEnd="@drawable/notification_expand_more"/>

            android:layout_height="wrap_content"

            android:layout_alignParentStart="true"

            android:layout_centerVertical="true"

            android:paddingStart="16dp"

            android:textColor="#DD000000"

            android:paddingEnd="4dp"/>



    <android.widget.Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1"

        />

        <ImageView

            android:id="@+id/expand_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@+id/snooze_option_default"

            android:layout_centerVertical="true"

            android:paddingTop="1dp"

            android:tint="#9E9E9E" />



        <TextView

            android:id="@+id/undo"

        style="@style/TextAppearance.SnoozeSnackBar.Button"

            style="@style/TextAppearance.NotificationInfo.Button"

            android:layout_width="wrap_content"

        android:layout_height="match_parent"

            android:layout_height="36dp"

            android:layout_marginEnd="8dp"

        android:layout_marginStart="8dp"

        android:background="@drawable/btn_borderless_rect"

        android:layout_gravity="end"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:text="@string/snooze_undo" />

    </RelativeLayout>



    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="0.5dp"

        android:background="#9E9E9E" />



    <LinearLayout

        android:id="@+id/snooze_options"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:orientation="vertical" />

packages/SystemUI/res/layout/notification_snooze_option.xml

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

<!--

    Copyright 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.

-->

<TextView

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

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_marginStart="@*android:dimen/notification_content_margin_start"

        android:layout_marginEnd="@*android:dimen/notification_content_margin_end"

        android:gravity="center_vertical"

        android:textSize="14sp"

        android:textColor="#DD000000"/>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

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

    <color name="notification_guts_bg_color">#eeeeee</color>



    <!-- Colors of the snooze menu reached via snooze icon behind a notification -->

    <color name="snooze_snackbar_bg">#FF4A4A4A</color>

	<color name="snooze_snackbar_text">#FFA6BAFF</color>



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



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

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
    <dimen name="notification_menu_icon_padding">20dp</dimen>



    <!-- The minimum height for the snackbar shown after the snooze option has been chosen. -->

    <dimen name="snooze_snackbar_min_height">48dp</dimen>

    <dimen name="snooze_snackbar_min_height">56dp</dimen>



    <!-- The text size of options in the snooze menu. -->

    <dimen name="snooze_option_text_size">14sp</dimen>

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1493,8 +1493,6 @@ 
    <string name="snooze_option_30_min">30 minutes</string>

    <!-- Notification: Menu row: Snooze options: 1 hour option. [CHAR LIMIT=50]-->

    <string name="snooze_option_1_hour">1 hour</string>

    <!-- Notification: Menu row: Snooze options: cancel snoozing option. [CHAR LIMIT=50] -->

    <string name="snooze_option_dont_snooze">Cancel</string>

    <!-- Notification: Menu row: Snooze undo button label. [CHAR LIMIT=50]-->

    <string name="snooze_undo">UNDO</string>