Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev

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

@@ -1123,6 +1123,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         updateMaxHeights();
+        if (mSettingsIconRow != null) {
+            mSettingsIconRow.updateVerticalLocation();
+        }
     }
 
     private void updateMaxHeights() {

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

@@ -244,7 +244,6 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC
     }
 
     public void setIconLocation(boolean onLeft) {
-        updateVerticalLocation();
         if ((mIconPlaced && onLeft == mOnLeft) || mSnapping || mParent == null
                 || mGearIcon.getWidth() == 0) {
             // Do nothing