summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/popup/PopupContainerWithArrow.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-09-19 23:25:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-09-19 23:25:35 +0000
commitfb46415e803a7f20a7d48bf42106f3f40cd769dd (patch)
treeb755c5b64eb096681181d4ddb36c313988309141 /src/com/android/launcher3/popup/PopupContainerWithArrow.java
parentfe8a39d8b0750a332787abbe1a210fb55e444223 (diff)
parent7f55620089eb54a73a41fe0ba18d4f4ec720ebb7 (diff)
downloadandroid_packages_apps_Trebuchet-fb46415e803a7f20a7d48bf42106f3f40cd769dd.tar.gz
android_packages_apps_Trebuchet-fb46415e803a7f20a7d48bf42106f3f40cd769dd.tar.bz2
android_packages_apps_Trebuchet-fb46415e803a7f20a7d48bf42106f3f40cd769dd.zip
Merge "Merge branch 'ub-launcher3-dorval-polish2'" into oc-mr1-dev
Diffstat (limited to 'src/com/android/launcher3/popup/PopupContainerWithArrow.java')
-rw-r--r--src/com/android/launcher3/popup/PopupContainerWithArrow.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index c3e2d8b89..8441598cf 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -275,8 +275,9 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra
if (itemTypeToPopulate == PopupPopulator.Item.NOTIFICATION) {
mNotificationItemView = (NotificationItemView) item;
boolean notificationFooterHasIcons = numNotifications > 1;
- int footerHeight = notificationFooterHasIcons ?
- res.getDimensionPixelSize(R.dimen.notification_footer_height) : 0;
+ int footerHeight = res.getDimensionPixelSize(
+ notificationFooterHasIcons ? R.dimen.notification_footer_height
+ : R.dimen.notification_empty_footer_height);
item.findViewById(R.id.footer).getLayoutParams().height = footerHeight;
if (notificationFooterHasIcons) {
mNotificationItemView.findViewById(R.id.divider).setVisibility(VISIBLE);