Merge "AOD: Notification groups on Ambient Display" into oc-dev am: bafe438d71

am: ec9559ddc6

Change-Id: I176adacd40cce9d0b321501e8fe8d29f1168f0d5

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc packages/SystemUI/res/values/dimens.xml
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index ac8219c,49d20a5..9b26a19
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@@ -1159,8 -1152,12 +1166,12 @@@ public class ExpandableNotificationRow 
          return mNotificationInflater;
      }
  
+     public int getNotificationColorAmbient() {
+         return mNotificationColorAmbient;
+     }
+ 
      public interface ExpansionLogger {
 -        public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
 +        void logNotificationExpansion(String key, boolean userAction, boolean expanded);
      }
  
      public ExpandableNotificationRow(Context context, AttributeSet attrs) {

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
index 79926fb,cb1f44e..9ad5dd7
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
@@@ -29,8 -28,8 +29,7 @@@ import android.view.View
  import android.view.ViewGroup;
  import android.widget.RemoteViews;
  import android.widget.TextView;
 -
  import com.android.systemui.R;
- import com.android.systemui.ViewInvertHelper;
  import com.android.systemui.statusbar.CrossFadeHelper;
  import com.android.systemui.statusbar.ExpandableNotificationRow;
  import com.android.systemui.statusbar.NotificationHeaderUtil;
@@@ -66,12 -65,10 +65,11 @@@ public class NotificationChildrenContai
      private final HybridGroupManager mHybridGroupManager;
      private int mChildPadding;
      private int mDividerHeight;
 -    private int mMaxNotificationHeight;
 +    private float mDividerAlpha;
      private int mNotificationHeaderMargin;
 +
      private int mNotificatonTopPadding;
      private float mCollapsedBottompadding;
-     private ViewInvertHelper mOverflowInvertHelper;
      private boolean mChildrenExpanded;
      private ExpandableNotificationRow mContainingNotification;
      private TextView mOverflowNumber;
@@@ -96,11 -90,8 +96,11 @@@
      private int mClipBottomAmount;
      private boolean mIsLowPriority;
      private OnClickListener mHeaderClickListener;
-     private boolean mShowingNormalHeader;
+     private ViewGroup mCurrentHeader;
  
 +    private boolean mShowDividersWhenExpanded;
 +    private boolean mHideDividersDuringExpand;
 +
      public NotificationChildrenContainer(Context context) {
          this(context, null);
      }