expandButton.setVisibility(VISIBLE);
mNotificationHeader.setOnClickListener(mExpandClickListener);
mNotificationHeaderWrapper = NotificationViewWrapper.wrap(getContext(),
- mNotificationHeader);
+ mNotificationHeader, this);
addView(mNotificationHeader, indexOfChild(mChildrenContainer) + 1);
mTranslateableViews.add(mNotificationHeader);
} else {
addView(child);
mContractedChild = child;
mContractedChild.addOnLayoutChangeListener(mLayoutUpdater);
- mContractedWrapper = NotificationViewWrapper.wrap(getContext(), child);
+ mContractedWrapper = NotificationViewWrapper.wrap(getContext(), child,
+ mContainingNotification);
selectLayout(false /* animate */, true /* force */);
mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
}
addView(child);
mExpandedChild = child;
mExpandedChild.addOnLayoutChangeListener(mLayoutUpdater);
- mExpandedWrapper = NotificationViewWrapper.wrap(getContext(), child);
+ mExpandedWrapper = NotificationViewWrapper.wrap(getContext(), child,
+ mContainingNotification);
selectLayout(false /* animate */, true /* force */);
}
addView(child);
mHeadsUpChild = child;
mHeadsUpChild.addOnLayoutChangeListener(mLayoutUpdater);
- mHeadsUpWrapper = NotificationViewWrapper.wrap(getContext(), child);
+ mHeadsUpWrapper = NotificationViewWrapper.wrap(getContext(), child,
+ mContainingNotification);
selectLayout(false /* animate */, true /* force */);
}
import android.service.notification.StatusBarNotification;
import android.view.View;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
+
/**
* Wraps a notification containing a big picture template
*/
public class NotificationBigPictureTemplateViewWrapper extends NotificationTemplateViewWrapper {
- protected NotificationBigPictureTemplateViewWrapper(Context ctx, View view) {
- super(ctx, view);
+ protected NotificationBigPictureTemplateViewWrapper(Context ctx, View view,
+ ExpandableNotificationRow row) {
+ super(ctx, view, row);
}
@Override
import android.view.View;
import com.android.internal.widget.ImageFloatingTextView;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.TransformableView;
/**
private ImageFloatingTextView mBigtext;
- protected NotificationBigTextTemplateViewWrapper(Context ctx, View view) {
- super(ctx, view);
+ protected NotificationBigTextTemplateViewWrapper(Context ctx, View view,
+ ExpandableNotificationRow row) {
+ super(ctx, view, row);
}
private void resolveViews(StatusBarNotification notification) {
import com.android.systemui.R;
import com.android.systemui.ViewInvertHelper;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.phone.NotificationPanelView;
/**
private boolean mShouldInvertDark;
private boolean mShowingLegacyBackground;
- protected NotificationCustomViewWrapper(View view) {
- super(view);
+ protected NotificationCustomViewWrapper(View view, ExpandableNotificationRow row) {
+ super(view, row);
mInvertHelper = new ViewInvertHelper(view, NotificationPanelView.DOZE_ANIMATION_DURATION);
}
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.ViewInvertHelper;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.TransformableView;
import com.android.systemui.statusbar.ViewTransformationHelper;
import com.android.systemui.statusbar.phone.NotificationPanelView;
private ImageView mExpandButton;
private NotificationHeaderView mNotificationHeader;
- protected NotificationHeaderViewWrapper(Context ctx, View view) {
- super(view);
+ protected NotificationHeaderViewWrapper(Context ctx, View view, ExpandableNotificationRow row) {
+ super(view, row);
mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
mInvertHelper = new ViewInvertHelper(ctx, NotificationPanelView.DOZE_ANIMATION_DURATION);
mTransformationHelper = new ViewTransformationHelper();
} else {
mInvertHelper.update(dark);
}
- if (mIcon != null) {
+ if (mIcon != null && !mRow.isChildInGroup()) {
+ // We don't update the color for children views / their icon is invisible anyway.
+ // It also may lead to bugs where the icon isn't correctly greyed out.
boolean hadColorFilter = mNotificationHeader.getOriginalIconColor()
!= NotificationHeaderView.NO_COLOR;
if (fade) {
import android.service.notification.StatusBarNotification;
import android.view.View;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.TransformableView;
/**
*/
public class NotificationMediaTemplateViewWrapper extends NotificationTemplateViewWrapper {
- protected NotificationMediaTemplateViewWrapper(Context ctx, View view) {
- super(ctx, view);
+ protected NotificationMediaTemplateViewWrapper(Context ctx, View view,
+ ExpandableNotificationRow row) {
+ super(ctx, view, row);
}
View mActions;
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.systemui.Interpolators;
import com.android.systemui.statusbar.CrossFadeHelper;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.TransformableView;
import com.android.systemui.statusbar.ViewTransformationHelper;
-import com.android.systemui.statusbar.stack.StackStateAnimator;
/**
* Wraps a notification view inflated from a template.
private TextView mTitle;
private TextView mText;
- protected NotificationTemplateViewWrapper(Context ctx, View view) {
- super(ctx, view);
+ protected NotificationTemplateViewWrapper(Context ctx, View view, ExpandableNotificationRow row) {
+ super(ctx, view, row);
mTransformationHelper.setCustomTransformation(
new ViewTransformationHelper.CustomTransformation() {
@Override
import com.android.systemui.Interpolators;
import com.android.systemui.statusbar.CrossFadeHelper;
-import com.android.systemui.statusbar.NotificationContentView;
+import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.TransformableView;
import com.android.systemui.statusbar.phone.NotificationPanelView;
protected final ColorMatrix mGrayscaleColorMatrix = new ColorMatrix();
protected final View mView;
+ protected final ExpandableNotificationRow mRow;
protected boolean mDark;
protected boolean mDarkInitialized = false;
- public static NotificationViewWrapper wrap(Context ctx, View v) {
+ public static NotificationViewWrapper wrap(Context ctx, View v, ExpandableNotificationRow row) {
if (v.getId() == com.android.internal.R.id.status_bar_latest_event_content) {
if ("bigPicture".equals(v.getTag())) {
- return new NotificationBigPictureTemplateViewWrapper(ctx, v);
+ return new NotificationBigPictureTemplateViewWrapper(ctx, v, row);
} else if ("bigText".equals(v.getTag())) {
- return new NotificationBigTextTemplateViewWrapper(ctx, v);
+ return new NotificationBigTextTemplateViewWrapper(ctx, v, row);
} else if ("media".equals(v.getTag()) || "bigMediaNarrow".equals(v.getTag())) {
- return new NotificationMediaTemplateViewWrapper(ctx, v);
+ return new NotificationMediaTemplateViewWrapper(ctx, v, row);
}
- return new NotificationTemplateViewWrapper(ctx, v);
+ return new NotificationTemplateViewWrapper(ctx, v, row);
} else if (v instanceof NotificationHeaderView) {
- return new NotificationHeaderViewWrapper(ctx, v);
+ return new NotificationHeaderViewWrapper(ctx, v, row);
} else {
- return new NotificationCustomViewWrapper(v);
+ return new NotificationCustomViewWrapper(v, row);
}
}
- protected NotificationViewWrapper(View view) {
+ protected NotificationViewWrapper(View view, ExpandableNotificationRow row) {
mView = view;
+ mRow = row;
}
/**