resolve merge conflicts of 383cc530492e to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52ee72a7e09792c604eb7cb4a76a6657f808e720

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
index 2c0905b,a4fadc4..3937dd3
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
@@@ -117,7 -122,7 +122,8 @@@ public class NotificationIconContainer 
      private float mVisualOverflowAdaption;
      private boolean mDisallowNextAnimation;
      private boolean mAnimationsEnabled = true;
+     private ArrayMap<String, ArrayList<StatusBarIcon>> mReplacingIcons;
 +    private int mDarkOffsetX;
  
      public NotificationIconContainer(Context context, AttributeSet attrs) {
          super(context, attrs);
@@@ -482,10 -508,10 +517,14 @@@
          mAnimationsEnabled = enabled;
      }
  
 +    public void setDarkOffsetX(int offsetX) {
 +        mDarkOffsetX = offsetX;
 +    }
 +
+     public void setReplacingIcons(ArrayMap<String, ArrayList<StatusBarIcon>> replacingIcons) {
+         mReplacingIcons = replacingIcons;
+     }
+ 
      public class IconState extends ViewState {
          public float iconAppearAmount = 1.0f;
          public float clampedAppearAmount = 1.0f;

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index c8b3e2f,a3d812c..cbd315b
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@@ -4242,10 -4243,15 +4243,19 @@@ public class NotificationStackScrollLay
          mAmbientState.setUnlockHintRunning(running);
      }
  
+     public void setQsCustomizerShowing(boolean isShowing) {
+         mAmbientState.setQsCustomizerShowing(isShowing);
+         requestChildrenUpdate();
+     }
+ 
+     public void setHeadsUpGoingAwayAnimationsAllowed(boolean headsUpGoingAwayAnimationsAllowed) {
+         mHeadsUpGoingAwayAnimationsAllowed = headsUpGoingAwayAnimationsAllowed;
+     }
+ 
 +    public void setDarkShelfOffsetX(int shelfOffsetX) {
 +        mShelf.setDarkOffsetX(shelfOffsetX);
 +    }
 +
      /**
       * A listener that is notified when some child locations might have changed.
       */