commit 0b8a985cd6ad499e8532d8468ea0ef68147eed2d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 20 20:13:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 20 20:13:30 2017 +0000
tree bb1c64a3c87e29af22b8d77deb1e74232ceb4f57
parent 99cc68364768834b494b0fe06f4b80a607184cbf
parent 54540975a51c5433b4c77447acf1f6cb2b1e3562

Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index ed4f685..22c0b736 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -1973,6 +1973,9 @@
         if (mGuts != null) {
             mGuts.setActualHeight(height);
         }
+        if (mMenuRow.getMenuView() != null) {
+            mMenuRow.onHeightUpdate();
+        }
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
index fddc446..99b4b07 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
@@ -431,7 +431,7 @@
         if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) {
             return;
         }
-        int parentHeight = mParent.getCollapsedHeight();
+        int parentHeight = mParent.getActualHeight();
         float translationY;
         if (parentHeight < mVertSpaceForIcons) {
             translationY = (parentHeight / 2) - (mHorizSpaceForIcon / 2);