Adjust some sizes in popup

- Increase main notification height and pad text/icon bottom
- Reduce shortcuts height when there are notifications to 48dp
  - When the last notification is dismissed, animate back to 56dp

Bug: 35766387
Change-Id: I84f843c042137fdf93fa720802eb2f19337197b4

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index cea4bc24f..c5daca0e1 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -306,6 +306,12 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra
                         shortcutsItemRoundedCorners &= ~ROUNDED_TOP_CORNERS;
                     }
                 }
+                if (itemTypeToPopulate != PopupPopulator.Item.SYSTEM_SHORTCUT_ICON
+                        && numNotifications > 0) {
+                    // Condense shortcuts height when there are notifications.
+                    item.getLayoutParams().height = res.getDimensionPixelSize(
+                            R.dimen.bg_popup_item_condensed_height);
+                }
                 mShortcutsItemView.addShortcutView(item, itemTypeToPopulate);
                 if (shouldUnroundBottomCorners) {
                     shortcutsItemRoundedCorners &= ~ROUNDED_BOTTOM_CORNERS;