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

Commit 7f3526a1 authored by Tony Wickham's avatar Tony Wickham
Browse files

Update notification view to match newer specs 

- Use smaller radius for notifications round rect background
- Remove "Notifications" header, and clip children to round rect path
- Flip main notification so that icon shows on the right instead of
  left; footer is also flipped so animation makes sense
- Clean up animations to animate view outline instead of height

Bug: 32410600
Change-Id: I6bd1e1f8395b3703f28c3b0056a89e67672368ab
parent e05b08f7

res/drawable/bg_white_pill_bottom.xml

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

<!-- Copyright (C) 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.

-->



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

       android:shape="rectangle">

    <solid android:color="#FFFFFF" />

    <corners android:bottomLeftRadius="@dimen/bg_pill_radius"

             android:bottomRightRadius="@dimen/bg_pill_radius" />

</shape>
 
 No newline at end of file

res/drawable/bg_white_pill_top.xml→res/drawable/bg_white_round_rect.xml

+1 −2
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid android:color="#FFFFFF" />

    <corners android:topLeftRadius="@dimen/bg_pill_radius"

             android:topRightRadius="@dimen/bg_pill_radius" />

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

</shape>
 
 No newline at end of file

res/layout/notification.xml

+2 −19
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="@dimen/bg_pill_width"

    android:layout_height="wrap_content"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:background="@drawable/bg_white_pill">

    android:background="@drawable/bg_white_round_rect">



    <RelativeLayout

        android:layout_width="match_parent"
@@ -28,27 +28,10 @@ 
        android:orientation="vertical"

        android:clipChildren="false">



        <TextView

            android:id="@+id/header"

            android:layout_width="match_parent"

            android:layout_height="@dimen/notification_footer_collapsed_height"

            android:gravity="center_vertical"

            android:textAlignment="center"

            android:text="@string/notifications_header"

            android:elevation="@dimen/notification_elevation"

            android:background="@drawable/bg_white_pill_top" />



        <View

            android:id="@+id/divider"

            android:layout_width="match_parent"

            android:layout_height="@dimen/notification_divider_height"

            android:layout_below="@id/header" />



        <include layout="@layout/notification_main"

            android:id="@+id/main_view"

            android:layout_width="match_parent"

            android:layout_height="@dimen/bg_pill_height"

            android:layout_below="@id/divider" />

            android:layout_height="@dimen/notification_main_height" />



        <include layout="@layout/notification_footer"

            android:id="@+id/footer"

res/layout/notification_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical"

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

    android:background="@drawable/bg_white_pill_bottom"

    android:elevation="@dimen/notification_elevation"

    android:clipChildren="false" >
@@ -34,6 +33,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:gravity="end"

        android:padding="@dimen/notification_footer_icon_row_padding"

        android:clipToPadding="false"

        android:clipChildren="false"/>

res/layout/notification_main.xml

+9 −8
Original line number Diff line number Diff line
@@ -21,20 +21,14 @@ 
    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:focusable="true"

    android:padding="@dimen/notification_padding"

    android:elevation="@dimen/notification_elevation" >



    <View

        android:id="@+id/popup_item_icon"

        android:layout_width="@dimen/notification_icon_size"

        android:layout_height="@dimen/notification_icon_size"

        android:layout_marginStart="@dimen/notification_icon_margin_start"

        android:layout_gravity="center_vertical" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:layout_marginStart="@dimen/notification_text_margin_start"

        android:layout_weight="1"

        android:gravity="center_vertical">

        <TextView

            android:id="@+id/title"
@@ -56,5 +50,12 @@ 
            android:layout_height="wrap_content" />

    </LinearLayout>



    <View

        android:id="@+id/popup_item_icon"

        android:layout_width="@dimen/notification_icon_size"

        android:layout_height="@dimen/notification_icon_size"

        android:layout_weight="0"

        android:layout_gravity="center_vertical" />



</com.android.launcher3.notification.NotificationMainView>