Revert "Revert "NotificationWrappers: Factor out doze treatment"" (7bcf6d37) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java

+10 −12

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.notification;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.graphics.ColorMatrixColorFilter;
		import android.graphics.Paint;
		import android.view.View;
		@@ -38,8 +38,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {
		private boolean mIsLegacy;
		private int mLegacyColor;

		protected NotificationCustomViewWrapper(View view, ExpandableNotificationRow row) {
		super(view, row);
		protected NotificationCustomViewWrapper(Context ctx, View view, ExpandableNotificationRow row) {
		super(ctx, view, row);
		mInvertHelper = new ViewInvertHelper(view, NotificationPanelView.DOZE_ANIMATION_DURATION);
		mLegacyColor = row.getContext().getColor(R.color.notification_legacy_background_color);
		}
		@@ -67,13 +67,11 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {
		}

		protected void fadeGrayscale(final boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		updateGrayscaleMatrix((float) animation.getAnimatedValue());
		mGreyPaint.setColorFilter(new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		getDozer().startIntensityAnimation(animation -> {
		getDozer().updateGrayscaleMatrix((float) animation.getAnimatedValue());
		mGreyPaint.setColorFilter(
		new ColorMatrixColorFilter(getDozer().getGrayscaleColorMatrix()));
		mView.setLayerPaint(mGreyPaint);
		}
		}, dark, delay, new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		@@ -86,9 +84,9 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {

		protected void updateGrayscale(boolean dark) {
		if (dark) {
		updateGrayscaleMatrix(1f);
		getDozer().updateGrayscaleMatrix(1f);
		mGreyPaint.setColorFilter(
		new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		new ColorMatrixColorFilter(getDozer().getGrayscaleColorMatrix()));
		mView.setLayerPaint(mGreyPaint);
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationDozeHelper.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.graphics.ColorMatrix;
		import android.graphics.ColorMatrixColorFilter;
		import android.widget.ImageView;

		import com.android.systemui.Interpolators;
		import com.android.systemui.statusbar.phone.NotificationPanelView;

		public class NotificationDozeHelper {
		private final ColorMatrix mGrayscaleColorMatrix = new ColorMatrix();

		public void fadeGrayscale(final ImageView target, final boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		updateGrayscaleMatrix((float) animation.getAnimatedValue());
		target.setColorFilter(new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		}
		}, dark, delay, new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		if (!dark) {
		target.setColorFilter(null);
		}
		}
		});
		}

		public void updateGrayscale(ImageView target, boolean dark) {
		if (dark) {
		updateGrayscaleMatrix(1f);
		target.setColorFilter(new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		} else {
		target.setColorFilter(null);
		}
		}

		public void startIntensityAnimation(ValueAnimator.AnimatorUpdateListener updateListener,
		boolean dark, long delay, Animator.AnimatorListener listener) {
		float startIntensity = dark ? 0f : 1f;
		float endIntensity = dark ? 1f : 0f;
		ValueAnimator animator = ValueAnimator.ofFloat(startIntensity, endIntensity);
		animator.addUpdateListener(updateListener);
		animator.setDuration(NotificationPanelView.DOZE_ANIMATION_DURATION);
		animator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN);
		animator.setStartDelay(delay);
		if (listener != null) {
		animator.addListener(listener);
		}
		animator.start();
		}

		public void updateGrayscaleMatrix(float intensity) {
		mGrayscaleColorMatrix.setSaturation(1 - intensity);
		}

		public ColorMatrix getGrayscaleColorMatrix() {
		return mGrayscaleColorMatrix;
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java

+13 −113

Original line number	Diff line number	Diff line
		@@ -16,17 +16,10 @@

		package com.android.systemui.statusbar.notification;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.app.Notification;
		import android.content.Context;
		import android.graphics.Color;
		import android.graphics.ColorFilter;
		import android.graphics.ColorMatrixColorFilter;
		import android.graphics.PorterDuff;
		import android.graphics.PorterDuffColorFilter;
		import android.graphics.drawable.Drawable;
		import android.util.ArraySet;
		import android.view.NotificationHeaderView;
		import android.view.View;
		@@ -37,7 +30,6 @@ import android.widget.ImageView;
		import android.widget.TextView;

		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;
		@@ -55,10 +47,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {

		private static final Interpolator LOW_PRIORITY_HEADER_CLOSE
		= new PathInterpolator(0.4f, 0f, 0.7f, 1f);
		private final PorterDuffColorFilter mIconColorFilter = new PorterDuffColorFilter(
		0, PorterDuff.Mode.SRC_ATOP);
		private final int mIconDarkAlpha;
		private final int mIconDarkColor = 0xffffffff;

		protected final ViewInvertHelper mInvertHelper;
		protected final ViewTransformationHelper mTransformationHelper;
		@@ -74,8 +62,7 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		private boolean mTransformLowPriorityTitle;

		protected NotificationHeaderViewWrapper(Context ctx, View view, ExpandableNotificationRow row) {
		super(view, row);
		mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
		super(ctx, view, row);
		mInvertHelper = new ViewInvertHelper(ctx, NotificationPanelView.DOZE_ANIMATION_DURATION);
		mTransformationHelper = new ViewTransformationHelper();

		@@ -108,6 +95,16 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		updateInvertHelper();
		}

		@Override
		protected NotificationDozeHelper createDozer(Context ctx) {
		return new NotificationIconDozeHelper(ctx);
		}

		@Override
		protected NotificationIconDozeHelper getDozer() {
		return (NotificationIconDozeHelper) super.getDozer();
		}

		protected void resolveHeaderViews() {
		mIcon = (ImageView) mView.findViewById(com.android.internal.R.id.icon);
		mHeaderText = (TextView) mView.findViewById(com.android.internal.R.id.header_text);
		@@ -116,6 +113,7 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		mColor = resolveColor(mExpandButton);
		mNotificationHeader = (NotificationHeaderView) mView.findViewById(
		com.android.internal.R.id.notification_header);
		getDozer().setColor(mColor);
		}

		private int resolveColor(ImageView icon) {
		@@ -223,90 +221,8 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		// It also may lead to bugs where the icon isn't correctly greyed out.
		boolean hadColorFilter = mNotificationHeader.getOriginalIconColor()
		!= NotificationHeaderView.NO_COLOR;
		if (fade) {
		if (hadColorFilter) {
		fadeIconColorFilter(mIcon, dark, delay);
		fadeIconAlpha(mIcon, dark, delay);
		} else {
		fadeGrayscale(mIcon, dark, delay);
		}
		} else {
		if (hadColorFilter) {
		updateIconColorFilter(mIcon, dark);
		updateIconAlpha(mIcon, dark);
		} else {
		updateGrayscale(mIcon, dark);
		}
		}
		}
		}

		private void fadeIconColorFilter(final ImageView target, boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		updateIconColorFilter(target, (Float) animation.getAnimatedValue());
		}
		}, dark, delay, null /* listener */);
		}

		private void fadeIconAlpha(final ImageView target, boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		float t = (float) animation.getAnimatedValue();
		target.setImageAlpha((int) (255 * (1f - t) + mIconDarkAlpha * t));
		}
		}, dark, delay, null /* listener */);
		}

		protected void fadeGrayscale(final ImageView target, final boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		updateGrayscaleMatrix((float) animation.getAnimatedValue());
		target.setColorFilter(new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		}
		}, dark, delay, new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		if (!dark) {
		target.setColorFilter(null);
		}
		}
		});
		}

		private void updateIconColorFilter(ImageView target, boolean dark) {
		updateIconColorFilter(target, dark ? 1f : 0f);
		}

		private void updateIconColorFilter(ImageView target, float intensity) {
		int color = interpolateColor(mColor, mIconDarkColor, intensity);
		mIconColorFilter.setColor(color);
		Drawable iconDrawable = target.getDrawable();

		// Also, the notification might have been modified during the animation, so background
		// might be null here.
		if (iconDrawable != null) {
		Drawable d = iconDrawable.mutate();
		// DrawableContainer ignores the color filter if it's already set, so clear it first to
		// get it set and invalidated properly.
		d.setColorFilter(null);
		d.setColorFilter(mIconColorFilter);
		}
		}

		private void updateIconAlpha(ImageView target, boolean dark) {
		target.setImageAlpha(dark ? mIconDarkAlpha : 255);
		}

		protected void updateGrayscale(ImageView target, boolean dark) {
		if (dark) {
		updateGrayscaleMatrix(1f);
		target.setColorFilter(new ColorMatrixColorFilter(mGrayscaleColorMatrix));
		} else {
		target.setColorFilter(null);
		getDozer().setImageDark(mIcon, dark, fade, delay, !hadColorFilter);
		}
		}

		@@ -316,22 +232,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		mNotificationHeader.setOnClickListener(expandable ? onClickListener : null);
		}

		private static int interpolateColor(int source, int target, float t) {
		int aSource = Color.alpha(source);
		int rSource = Color.red(source);
		int gSource = Color.green(source);
		int bSource = Color.blue(source);
		int aTarget = Color.alpha(target);
		int rTarget = Color.red(target);
		int gTarget = Color.green(target);
		int bTarget = Color.blue(target);
		return Color.argb(
		(int) (aSource * (1f - t) + aTarget * t),
		(int) (rSource * (1f - t) + rTarget * t),
		(int) (gSource * (1f - t) + gTarget * t),
		(int) (bSource * (1f - t) + bTarget * t));
		}

		@Override
		public NotificationHeaderView getNotificationHeader() {
		return mNotificationHeader;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationIconDozeHelper.java

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification;

		import android.content.Context;
		import android.graphics.Color;
		import android.graphics.PorterDuff;
		import android.graphics.PorterDuffColorFilter;
		import android.graphics.drawable.Drawable;
		import android.widget.ImageView;

		import com.android.systemui.R;

		public class NotificationIconDozeHelper extends NotificationDozeHelper {

		private final int mImageDarkAlpha;
		private final int mImageDarkColor = 0xffffffff;
		private final PorterDuffColorFilter mImageColorFilter = new PorterDuffColorFilter(
		0, PorterDuff.Mode.SRC_ATOP);

		private int mColor = Color.BLACK;

		public NotificationIconDozeHelper(Context ctx) {
		mImageDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
		}

		public void setColor(int color) {
		mColor = color;
		}

		public void setImageDark(ImageView target, boolean dark, boolean fade, long delay,
		boolean useGrayscale) {
		if (fade) {
		if (!useGrayscale) {
		fadeImageColorFilter(target, dark, delay);
		fadeImageAlpha(target, dark, delay);
		} else {
		fadeGrayscale(target, dark, delay);
		}
		} else {
		if (!useGrayscale) {
		updateImageColorFilter(target, dark);
		updateImageAlpha(target, dark);
		} else {
		updateGrayscale(target, dark);
		}
		}
		}

		private void fadeImageColorFilter(final ImageView target, boolean dark, long delay) {
		startIntensityAnimation(animation -> {
		updateImageColorFilter(target, (Float) animation.getAnimatedValue());
		}, dark, delay, null /* listener */);
		}

		private void fadeImageAlpha(final ImageView target, boolean dark, long delay) {
		startIntensityAnimation(animation -> {
		float t = (float) animation.getAnimatedValue();
		target.setImageAlpha((int) (255 * (1f - t) + mImageDarkAlpha * t));
		}, dark, delay, null /* listener */);
		}

		private void updateImageColorFilter(ImageView target, boolean dark) {
		updateImageColorFilter(target, dark ? 1f : 0f);
		}

		private void updateImageColorFilter(ImageView target, float intensity) {
		int color = NotificationUtils.interpolateColors(mColor, mImageDarkColor, intensity);
		mImageColorFilter.setColor(color);
		Drawable imageDrawable = target.getDrawable();

		// Also, the notification might have been modified during the animation, so background
		// might be null here.
		if (imageDrawable != null) {
		Drawable d = imageDrawable.mutate();
		// DrawableContainer ignores the color filter if it's already set, so clear it first to
		// get it set and invalidated properly.
		d.setColorFilter(null);
		d.setColorFilter(mImageColorFilter);
		}
		}

		private void updateImageAlpha(ImageView target, boolean dark) {
		target.setImageAlpha(dark ? mImageDarkAlpha : 255);
		}

		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java

+16 −19

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.statusbar.notification;

		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.graphics.Color;
		import android.service.notification.StatusBarNotification;
		@@ -46,7 +45,8 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
		private int mContentHeight;
		private int mMinHeightHint;

		protected NotificationTemplateViewWrapper(Context ctx, View view, ExpandableNotificationRow row) {
		protected NotificationTemplateViewWrapper(Context ctx, View view,
		ExpandableNotificationRow row) {
		super(ctx, view, row);
		mTransformationHelper.setCustomTransformation(
		new ViewTransformationHelper.CustomTransformation() {
		@@ -154,16 +154,20 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
		// This also clears the existing types
		super.updateTransformedTypes();
		if (mTitle != null) {
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TITLE, mTitle);
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TITLE,
		mTitle);
		}
		if (mText != null) {
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TEXT, mText);
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TEXT,
		mText);
		}
		if (mPicture != null) {
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_IMAGE, mPicture);
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_IMAGE,
		mPicture);
		}
		if (mProgressBar != null) {
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_PROGRESS, mProgressBar);
		mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_PROGRESS,
		mProgressBar);
		}
		}

		@@ -173,7 +177,7 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
		return;
		}
		super.setDark(dark, fade, delay);
		setPictureGrayscale(dark, fade, delay);
		setPictureDark(dark, fade, delay);
		setProgressBarDark(dark, fade, delay);
		}

		@@ -188,12 +192,9 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
		}

		private void fadeProgressDark(final ProgressBar target, final boolean dark, long delay) {
		startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		getDozer().startIntensityAnimation(animation -> {
		float t = (float) animation.getAnimatedValue();
		updateProgressDark(target, t);
		}
		}, dark, delay, null /* listener */);
		}

		@@ -207,13 +208,9 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
		updateProgressDark(target, dark ? 1f : 0f);
		}

		protected void setPictureGrayscale(boolean grayscale, boolean fade, long delay) {
		private void setPictureDark(boolean dark, boolean fade, long delay) {
		if (mPicture != null) {
		if (fade) {
		fadeGrayscale(mPicture, grayscale, delay);
		} else {
		updateGrayscale(mPicture, grayscale);
		}
		getDozer().setImageDark(mPicture, dark, fade, delay, true /* useGrayscale */);
		}
		}