Merge "Remove the scrimming of notifications" into lmp-dev (f2f0a071) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -64,9 +64,4 @@
		/>
		</LinearLayout>

		<com.android.systemui.statusbar.NotificationScrimView
		android:id="@+id/scrim_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</com.android.systemui.statusbar.NotificationOverflowContainer>

packages/SystemUI/res/layout/status_bar_notification_row.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -59,9 +59,4 @@
		android:layout_height="match_parent"
		/>

		<com.android.systemui.statusbar.NotificationScrimView
		android:id="@+id/scrim_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</com.android.systemui.statusbar.ExpandableNotificationRow>

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView

		private NotificationBackgroundView mBackgroundNormal;
		private NotificationBackgroundView mBackgroundDimmed;
		private NotificationScrimView mScrimView;
		private ObjectAnimator mBackgroundAnimator;
		private RectF mAppearAnimationRect = new RectF();
		private PorterDuffColorFilter mAppearAnimationFilter;
		@@ -173,8 +172,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		mBackgroundDimmed.setCustomBackground(R.drawable.notification_material_bg_dim);
		updateBackground();
		updateBackgroundTint();
		mScrimView = (NotificationScrimView) findViewById(R.id.scrim_view);
		setScrimAmount(0);
		}

		private final Runnable mTapTimeoutRunnable = new Runnable() {
		@@ -465,7 +462,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		setPivotY(actualHeight / 2);
		mBackgroundNormal.setActualHeight(actualHeight);
		mBackgroundDimmed.setActualHeight(actualHeight);
		mScrimView.setActualHeight(actualHeight);
		}

		@Override
		@@ -473,7 +469,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		super.setClipTopAmount(clipTopAmount);
		mBackgroundNormal.setClipTopAmount(clipTopAmount);
		mBackgroundDimmed.setClipTopAmount(clipTopAmount);
		mScrimView.setClipTopAmount(clipTopAmount);
		}

		@Override
		@@ -496,11 +491,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		}
		}

		@Override
		public void setScrimAmount(float scrimAmount) {
		mScrimView.setAlpha(scrimAmount);
		}

		private void startAppearAnimation(boolean isAppearing, float translationDirection, long delay,
		long duration, final Runnable onFinishedRunnable) {
		if (mAppearAnimator != null) {

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -255,8 +255,6 @@ public abstract class ExpandableView extends FrameLayout {

		public abstract void performAddAnimation(long delay, long duration);

		public abstract void setScrimAmount(float scrimAmount);

		public void setBelowSpeedBump(boolean below) {
		}

packages/SystemUI/src/com/android/systemui/statusbar/NotificationScrimView.java

deleted100644 → 0

+0 −79

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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;

		import android.content.Context;
		import android.graphics.Canvas;
		import android.graphics.PorterDuff;
		import android.graphics.drawable.Drawable;
		import android.util.AttributeSet;
		import android.view.View;

		import com.android.keyguard.R;

		/**
		* A view that can be used for both the dimmed and normal background of an notification.
		*/
		public class NotificationScrimView extends View {

		private Drawable mBackground;
		private int mClipTopAmount;
		private int mActualHeight;

		public NotificationScrimView(Context context, AttributeSet attrs) {
		super(context, attrs);
		mBackground = getResources().getDrawable(R.drawable.notification_scrim);
		}

		@Override
		protected void onDraw(Canvas canvas) {
		draw(canvas, mBackground);
		}

		private void draw(Canvas canvas, Drawable drawable) {
		if (drawable != null) {
		drawable.setBounds(0, mClipTopAmount, getWidth(), mActualHeight);
		drawable.draw(canvas);
		}
		}

		@Override
		protected boolean verifyDrawable(Drawable who) {
		return super.verifyDrawable(who) \|\| who == mBackground;
		}

		public void setActualHeight(int actualHeight) {
		mActualHeight = actualHeight;
		invalidate();
		}

		public int getActualHeight() {
		return mActualHeight;
		}

		public void setClipTopAmount(int clipTopAmount) {
		mClipTopAmount = clipTopAmount;
		invalidate();
		}

		@Override
		public boolean hasOverlappingRendering() {

		// Prevents this view from creating a layer when alpha is animating.
		return false;
		}
		}