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
diff --git a/res/drawable/bg_white_round_rect.xml b/res/drawable/bg_white_round_rect.xml
deleted file mode 100644
index c7f786f..0000000
--- a/res/drawable/bg_white_round_rect.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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
diff --git a/res/layout/horizontal_divider.xml b/res/layout/horizontal_divider.xml
new file mode 100644
index 0000000..33773eb
--- /dev/null
+++ b/res/layout/horizontal_divider.xml
@@ -0,0 +1,5 @@
+<?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
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index f955c6b..a03dd08 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -19,9 +19,7 @@
android:id="@+id/notification_view"
android:layout_width="@dimen/bg_popup_item_width"
android:layout_height="wrap_content"
- android:elevation="@dimen/deep_shortcuts_elevation"
- android:background="@drawable/bg_white_round_rect"
- android:backgroundTint="@color/notification_color_beneath">
+ android:elevation="@dimen/deep_shortcuts_elevation">
<RelativeLayout
android:layout_width="match_parent"
@@ -35,7 +33,7 @@
android:layout_height="@dimen/notification_header_height"
android:paddingStart="@dimen/notification_padding_start"
android:paddingEnd="@dimen/notification_padding_end"
- android:background="@color/popup_header_background_color"
+ android:background="@color/popup_background_color"
android:elevation="@dimen/notification_elevation">
<TextView
android:id="@+id/notification_text"
diff --git a/res/layout/shortcuts_item.xml b/res/layout/shortcuts_item.xml
index 8b20bcb..e54462e 100644
--- a/res/layout/shortcuts_item.xml
+++ b/res/layout/shortcuts_item.xml
@@ -19,8 +19,7 @@
android:id="@+id/shortcuts_view"
android:layout_width="@dimen/bg_popup_item_width"
android:layout_height="wrap_content"
- android:elevation="@dimen/deep_shortcuts_elevation"
- android:background="@drawable/bg_white_round_rect">
+ android:elevation="@dimen/deep_shortcuts_elevation">
<LinearLayout
android:id="@+id/deep_shortcuts"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f4cd8c8..6deffc1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,7 +31,7 @@
<color name="spring_loaded_highlighted_panel_border_color">#FFF</color>
<!-- 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="notification_icon_default_color">#757575</color> <!-- Gray 600 -->
<color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->
diff --git a/res/values/config.xml b/res/values/config.xml
index 9b7c795..6df556b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -124,11 +124,8 @@
<item type="id" name="preview_image_id" />
<!-- Popup items -->
- <integer name="config_deepShortcutOpenDuration">220</integer>
- <integer name="config_deepShortcutArrowOpenDuration">80</integer>
- <integer name="config_deepShortcutOpenStagger">40</integer>
- <integer name="config_deepShortcutCloseDuration">150</integer>
- <integer name="config_deepShortcutCloseStagger">20</integer>
+ <integer name="config_popupOpenCloseDuration">220</integer>
+ <integer name="config_popupArrowOpenDuration">80</integer>
<integer name="config_removeNotificationViewDuration">300</integer>
<!-- Accessibility actions -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 110e790..3a531b0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -148,7 +148,6 @@
<dimen name="deep_shortcuts_elevation">9dp</dimen>
<dimen name="bg_popup_item_width">220dp</dimen>
<dimen name="bg_popup_item_height">56dp</dimen>
- <dimen name="popup_items_spacing">4dp</dimen>
<dimen name="pre_drag_view_scale">6dp</dimen>
<!-- an icon with shortcuts must be dragged this far before the container is removed. -->
<dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen>