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

am: 0b8a985cd6

Change-Id: Ib8d76ea165032175be98e8c1023af6c973be1ee4

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

@@ -1974,6 +1974,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
         if (mGuts != null) {
             mGuts.setActualHeight(height);
         }
+        if (mMenuRow.getMenuView() != null) {
+            mMenuRow.onHeightUpdate();
+        }
     }
 
     @Override

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

@@ -431,7 +431,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
         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);