resolve merge conflicts of ce40da80701a to master

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

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