diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-11-16 01:15:37 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-16 01:15:37 +0000 |
commit | 7149889dc08b3b86126dead1276ec577f44ec6b5 (patch) | |
tree | 9b893fdd5b9cc53a29ed0f3307592d89de4878f6 /res | |
parent | bcca71116d58a5a0695f5516910bbc7be67ddba1 (diff) | |
parent | 00ac9202417cb5023b9990b2f6f33d321378ff26 (diff) | |
download | android_packages_apps_Trebuchet-7149889dc08b3b86126dead1276ec577f44ec6b5.tar.gz android_packages_apps_Trebuchet-7149889dc08b3b86126dead1276ec577f44ec6b5.tar.bz2 android_packages_apps_Trebuchet-7149889dc08b3b86126dead1276ec577f44ec6b5.zip |
Merge "Simplifying app icon popup" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/bg_notification_content.xml | 28 | ||||
-rw-r--r-- | res/layout/notification.xml | 97 | ||||
-rw-r--r-- | res/layout/notification_content.xml | 134 | ||||
-rw-r--r-- | res/layout/notification_footer.xml | 46 | ||||
-rw-r--r-- | res/layout/notification_gutter.xml | 21 | ||||
-rw-r--r-- | res/layout/notification_main.xml | 66 | ||||
-rw-r--r-- | res/layout/popup_container.xml | 7 | ||||
-rw-r--r-- | res/layout/shortcuts_item.xml | 39 | ||||
-rw-r--r-- | res/layout/system_shortcut_icons.xml | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 7 |
11 files changed, 187 insertions, 264 deletions
diff --git a/res/drawable/bg_notification_content.xml b/res/drawable/bg_notification_content.xml new file mode 100644 index 000000000..cf129eba8 --- /dev/null +++ b/res/drawable/bg_notification_content.xml @@ -0,0 +1,28 @@ +<?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. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="?attr/popupColorTertiary" /> + + <item android:height="3dp" android:top="0dp"> + <shape> + <gradient + android:angle="270" + android:endColor="@android:color/transparent" + android:startColor="#33000000" + android:type="linear" /> + </shape> + </item> +</layer-list> diff --git a/res/layout/notification.xml b/res/layout/notification.xml deleted file mode 100644 index 1eebb434b..000000000 --- a/res/layout/notification.xml +++ /dev/null @@ -1,97 +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. ---> - -<com.android.launcher3.notification.NotificationItemView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/notification_view" - android:layout_width="@dimen/bg_popup_item_width" - android:layout_height="wrap_content" - android:theme="@style/PopupItem" - android:elevation="@dimen/deep_shortcuts_elevation"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:clipChildren="false"> - - <View - android:id="@+id/gutter_top" - android:layout_width="match_parent" - android:layout_height="4dp" - android:theme="@style/PopupGutter" - android:visibility="gone" /> - - <FrameLayout - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_header_height" - android:paddingStart="@dimen/notification_padding_start" - android:paddingEnd="@dimen/notification_padding_end" - android:background="?attr/popupColorPrimary" - android:elevation="@dimen/notification_elevation" - android:layout_below="@id/gutter_top" > - <TextView - android:id="@+id/notification_text" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - android:gravity="center_vertical" - android:text="@string/notifications_header" - android:textSize="@dimen/notification_header_text_size" - android:textColor="?android:attr/textColorPrimary" /> - <TextView - android:id="@+id/notification_count" - android:layout_width="@dimen/notification_icon_size" - android:layout_height="match_parent" - android:layout_gravity="end" - android:gravity="center" - android:textSize="@dimen/notification_header_count_text_size" - android:fontFamily="sans-serif-medium" - android:textColor="?android:attr/textColorPrimary" /> - </FrameLayout> - - <include layout="@layout/notification_main" - android:id="@+id/main_view" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_main_height" - android:layout_below="@id/header" /> - - <View - android:id="@+id/divider" - android:layout_width="match_parent" - android:layout_height="@dimen/popup_item_divider_height" - android:background="?attr/popupColorTertiary" - android:layout_below="@id/main_view" - android:visibility="gone" /> - - <include layout="@layout/notification_footer" - android:id="@+id/footer" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_footer_height" - android:layout_below="@id/divider" /> - - <View - android:id="@+id/gutter_bottom" - android:layout_width="match_parent" - android:layout_height="4dp" - android:theme="@style/PopupGutter" - android:visibility="gone" - android:layout_below="@id/footer" /> - - </RelativeLayout> - -</com.android.launcher3.notification.NotificationItemView> diff --git a/res/layout/notification_content.xml b/res/layout/notification_content.xml new file mode 100644 index 000000000..d01be019e --- /dev/null +++ b/res/layout/notification_content.xml @@ -0,0 +1,134 @@ +<?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. +--> + +<merge + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <!-- header --> + <FrameLayout + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_header_height" + android:paddingEnd="@dimen/notification_padding_end" + android:paddingStart="@dimen/notification_padding_start"> + <TextView + android:id="@+id/notification_text" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="start" + android:gravity="center_vertical" + android:text="@string/notifications_header" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/notification_header_text_size" /> + <TextView + android:id="@+id/notification_count" + android:layout_width="@dimen/notification_icon_size" + android:layout_height="match_parent" + android:layout_gravity="end" + android:fontFamily="sans-serif-medium" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/notification_header_count_text_size" /> + </FrameLayout> + + <!-- Main view --> + <com.android.launcher3.notification.NotificationMainView + android:id="@+id/main_view" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_main_height" + android:background="@drawable/bg_notification_content" + android:focusable="true" > + + <LinearLayout + android:id="@+id/text_and_background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/popupColorPrimary" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingBottom="14dp" + android:paddingEnd="@dimen/notification_main_text_padding_end" + android:paddingStart="@dimen/notification_padding_start"> + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:fontFamily="sans-serif" + android:lines="1" + android:textAlignment="viewStart" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/notification_main_title_size" /> + + <TextView + android:id="@+id/text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:fontFamily="sans-serif" + android:lines="1" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/notification_main_text_size" /> + </LinearLayout> + + <View + android:id="@+id/popup_item_icon" + android:layout_width="@dimen/notification_icon_size" + android:layout_height="@dimen/notification_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginBottom="7dp" + android:layout_marginEnd="@dimen/notification_padding_end" /> + + </com.android.launcher3.notification.NotificationMainView> + + <!-- Divider --> + <View + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="@dimen/popup_item_divider_height" + android:layout_below="@id/main_view" + android:background="?attr/popupColorTertiary" /> + + <!-- Footer --> + <com.android.launcher3.notification.NotificationFooterLayout + android:id="@+id/footer" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_footer_height" + android:layout_gravity="center_vertical" + android:clipChildren="false"> + + <LinearLayout + android:id="@+id/icon_row" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false" + android:gravity="end|center_vertical" + android:orientation="horizontal" + android:padding="@dimen/notification_footer_icon_row_padding"/> + + <View + android:id="@+id/overflow" + android:layout_width="@dimen/horizontal_ellipsis_size" + android:layout_height="@dimen/horizontal_ellipsis_size" + android:layout_gravity="start|center_vertical" + android:layout_marginStart="@dimen/horizontal_ellipsis_offset" + android:background="@drawable/horizontal_ellipsis" /> + + </com.android.launcher3.notification.NotificationFooterLayout> +</merge>
\ No newline at end of file diff --git a/res/layout/notification_footer.xml b/res/layout/notification_footer.xml deleted file mode 100644 index 86280e0b6..000000000 --- a/res/layout/notification_footer.xml +++ /dev/null @@ -1,46 +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. ---> - - -<com.android.launcher3.notification.NotificationFooterLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:android="http://schemas.android.com/apk/res/android" - android:elevation="@dimen/notification_elevation" - android:clipChildren="false" - android:layout_gravity="center_vertical" - android:background="?attr/popupColorPrimary"> - - <LinearLayout - android:id="@+id/icon_row" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="end|center_vertical" - android:padding="@dimen/notification_footer_icon_row_padding" - android:clipToPadding="false" - android:clipChildren="false"/> - - <View - android:id="@+id/overflow" - android:layout_width="@dimen/horizontal_ellipsis_size" - android:layout_height="@dimen/horizontal_ellipsis_size" - android:background="@drawable/horizontal_ellipsis" - android:layout_marginStart="@dimen/horizontal_ellipsis_offset" - android:layout_gravity="start|center_vertical" /> - -</com.android.launcher3.notification.NotificationFooterLayout> - diff --git a/res/layout/notification_gutter.xml b/res/layout/notification_gutter.xml new file mode 100644 index 000000000..10e7f7d68 --- /dev/null +++ b/res/layout/notification_gutter.xml @@ -0,0 +1,21 @@ +<?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. +--> +<View + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="4dp" + android:layout_marginTop="4dp" + android:background="@drawable/bg_notification_content" />
\ No newline at end of file diff --git a/res/layout/notification_main.xml b/res/layout/notification_main.xml deleted file mode 100644 index f94face1b..000000000 --- a/res/layout/notification_main.xml +++ /dev/null @@ -1,66 +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. ---> - - -<com.android.launcher3.notification.NotificationMainView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - android:elevation="@dimen/notification_elevation" > - - <LinearLayout - android:id="@+id/text_and_background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_vertical" - android:background="?attr/popupColorPrimary" - android:paddingStart="@dimen/notification_padding_start" - android:paddingEnd="@dimen/notification_main_text_padding_end" - android:paddingBottom="14dp"> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAlignment="viewStart" - android:fontFamily="sans-serif" - android:textSize="@dimen/notification_main_title_size" - android:textColor="?android:attr/textColorPrimary" - android:lines="1" - android:ellipsize="end" /> - - <TextView - android:id="@+id/text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:textSize="@dimen/notification_main_text_size" - android:textColor="?android:attr/textColorSecondary" - android:lines="1" - android:ellipsize="end" /> - </LinearLayout> - - <View - android:id="@+id/popup_item_icon" - android:layout_width="@dimen/notification_icon_size" - android:layout_height="@dimen/notification_icon_size" - android:layout_marginEnd="@dimen/notification_padding_end" - android:layout_marginBottom="7dp" - android:layout_gravity="center_vertical|end" /> - -</com.android.launcher3.notification.NotificationMainView> - diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml index 67db4a561..c73740771 100644 --- a/res/layout/popup_container.xml +++ b/res/layout/popup_container.xml @@ -19,11 +19,8 @@ android:id="@+id/deep_shortcuts_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="4dp" - android:paddingBottom="4dp" + android:background="?attr/popupColorPrimary" android:clipToPadding="false" android:clipChildren="false" android:elevation="@dimen/deep_shortcuts_elevation" - android:orientation="vertical"> - -</com.android.launcher3.popup.PopupContainerWithArrow>
\ No newline at end of file + android:orientation="vertical" />
\ No newline at end of file diff --git a/res/layout/shortcuts_item.xml b/res/layout/shortcuts_item.xml deleted file mode 100644 index 7cd996de0..000000000 --- a/res/layout/shortcuts_item.xml +++ /dev/null @@ -1,39 +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. ---> - -<com.android.launcher3.shortcuts.ShortcutsItemView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/shortcuts_view" - android:layout_width="@dimen/bg_popup_item_width" - android:layout_height="wrap_content" - android:elevation="@dimen/deep_shortcuts_elevation"> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <!-- The shortcuts header is added at runtime when necessary. --> - - <LinearLayout - android:id="@+id/shortcuts" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> - </LinearLayout> - -</com.android.launcher3.shortcuts.ShortcutsItemView> diff --git a/res/layout/system_shortcut_icons.xml b/res/layout/system_shortcut_icons.xml index 34d63e71f..4daf46958 100644 --- a/res/layout/system_shortcut_icons.xml +++ b/res/layout/system_shortcut_icons.xml @@ -22,6 +22,4 @@ android:orientation="horizontal" android:gravity="end|center_vertical" android:background="?attr/popupColorSecondary" - android:elevation="1dp" - android:outlineProvider="none" /> - <!-- We have elevation so this is drawn on top, but no outline provider to remove shadow --> + android:clipToPadding="true" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2176c8da5..efe504394 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -181,6 +181,7 @@ <dimen name="deep_shortcut_drag_handle_size">16dp</dimen> <dimen name="popup_padding_start">10dp</dimen> <dimen name="popup_padding_end">16dp</dimen> + <dimen name="popup_vertical_padding">4dp</dimen> <dimen name="popup_arrow_width">10dp</dimen> <dimen name="popup_arrow_height">8dp</dimen> <dimen name="popup_arrow_vertical_offset">-2dp</dimen> @@ -228,7 +229,6 @@ <dimen name="notification_footer_icon_size">18dp</dimen> <!-- notification_icon_size + notification_padding_end + 16dp padding between icon and text --> <dimen name="notification_main_text_padding_end">52dp</dimen> - <dimen name="notification_elevation">2dp</dimen> <dimen name="horizontal_ellipsis_size">18dp</dimen> <!-- arrow_horizontal_offset_start - (ellipsis_size - arrow_width) / 2 --> <dimen name="horizontal_ellipsis_offset">19dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 8129e810f..8cc4743a3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -136,13 +136,6 @@ <style name="PopupItem"> <item name="android:colorControlHighlight">?attr/popupColorTertiary</item> </style> - <style name="PopupGutter"> - <item name="android:backgroundTintMode">multiply</item> - <item name="android:backgroundTint">?attr/popupColorSecondary</item> - <item name="android:background">@drawable/gutter_horizontal</item> - <item name="android:elevation">@dimen/notification_elevation</item> - <item name="android:outlineProvider">none</item> - </style> <!-- Drop targets --> <style name="DropTargetButtonBase"> |