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

Commit acaf5b3a authored by Tony's avatar Tony
Browse files

Remove gap between popup items 

- Unround interior corners
- Update colors (shortcuts are gray when next to
  notifications, notifications always white)
- Clean up animation to animate entire popup with
  simple reveal instead of individual items
  animating with reveal and icon scale

Bug: 35766387
Bug: 36110804
Change-Id: I33685d53e2db3904731676123dc230be4dabb5d4
parent d5645d40

res/drawable/bg_white_round_rect.xml

deleted100644 → 0
+0 −21
Original line number Original line 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:radius="@dimen/bg_round_rect_radius" />

</shape>
 
 No newline at end of file

res/layout/horizontal_divider.xml

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

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/popup_item_divider_height"

    android:background="?android:attr/listDivider"/>
 
 No newline at end of file

res/layout/notification.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -19,9 +19,7 @@ 
    android:id="@+id/notification_view"

    android:id="@+id/notification_view"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:elevation="@dimen/deep_shortcuts_elevation">

    android:background="@drawable/bg_white_round_rect"

    android:backgroundTint="@color/notification_color_beneath">





    <RelativeLayout

    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"
@@ -35,7 +33,7 @@ 
            android:layout_height="@dimen/notification_header_height"

            android:layout_height="@dimen/notification_header_height"

            android:paddingStart="@dimen/notification_padding_start"

            android:paddingStart="@dimen/notification_padding_start"

            android:paddingEnd="@dimen/notification_padding_end"

            android:paddingEnd="@dimen/notification_padding_end"

            android:background="@color/popup_header_background_color"

            android:background="@color/popup_background_color"

            android:elevation="@dimen/notification_elevation">

            android:elevation="@dimen/notification_elevation">

            <TextView

            <TextView

                android:id="@+id/notification_text"

                android:id="@+id/notification_text"

res/layout/shortcuts_item.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:id="@+id/shortcuts_view"

    android:id="@+id/shortcuts_view"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:elevation="@dimen/deep_shortcuts_elevation">

    android:background="@drawable/bg_white_round_rect">





    <LinearLayout

    <LinearLayout

        android:id="@+id/deep_shortcuts"

        android:id="@+id/deep_shortcuts"

res/values/colors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <color name="spring_loaded_highlighted_panel_border_color">#FFF</color>

    <color name="spring_loaded_highlighted_panel_border_color">#FFF</color>





    <!-- Popup container -->

    <!-- Popup container -->

    <color name="popup_header_background_color">#EEEEEE</color> <!-- Gray 200 -->

    <color name="popup_header_background_color">#F5F5F5</color> <!-- Gray 100 -->

    <color name="popup_background_color">#FFF</color>

    <color name="popup_background_color">#FFF</color>

    <color name="notification_icon_default_color">#757575</color> <!-- Gray 600 -->

    <color name="notification_icon_default_color">#757575</color> <!-- Gray 600 -->

    <color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->

    <color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->