Merge "Notifications: Clear animation start visible type when not animating" (4448cd5e) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.view.ViewTreeObserver;
		import android.widget.FrameLayout;
		import android.widget.ImageView;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.NotificationColorUtil;
		import com.android.systemui.R;
		import com.android.systemui.statusbar.notification.HybridNotificationView;
		@@ -693,6 +694,9 @@ public class NotificationContentView extends FrameLayout {
		forceUpdateVisibility(VISIBLE_TYPE_HEADSUP, mHeadsUpChild, mHeadsUpWrapper);
		forceUpdateVisibility(VISIBLE_TYPE_SINGLELINE, mSingleLineView, mSingleLineView);
		forceUpdateVisibility(VISIBLE_TYPE_AMBIENT, mAmbientChild, mAmbientWrapper);
		// forceUpdateVisibilities cancels outstanding animations without updating the
		// mAnimationStartVisibleType. Do so here instead.
		mAnimationStartVisibleType = UNDEFINED;
		}

		private void forceUpdateVisibility(int type, View view, TransformableView wrapper) {
		@@ -748,6 +752,9 @@ public class NotificationContentView extends FrameLayout {
		mSingleLineView, mSingleLineView);
		updateViewVisibility(visibleType, VISIBLE_TYPE_AMBIENT,
		mAmbientChild, mAmbientWrapper);
		// updateViewVisibilities cancels outstanding animations without updating the
		// mAnimationStartVisibleType. Do so here instead.
		mAnimationStartVisibleType = UNDEFINED;
		}

		private void updateViewVisibility(int visibleType, int type, View view,
		@@ -1236,6 +1243,11 @@ public class NotificationContentView extends FrameLayout {
		}
		}

		@VisibleForTesting
		boolean isAnimatingVisibleType() {
		return mAnimationStartVisibleType != UNDEFINED;
		}

		public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) {
		mHeadsUpAnimatingAway = headsUpAnimatingAway;
		selectLayout(false /* animate /, true / force */);

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationContentViewTest.java

0 → 100644

+75 −0

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 static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.annotation.UiThreadTest;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.view.View;

		import org.junit.Assert;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class NotificationContentViewTest {

		NotificationContentView mView;
		Context mContext;

		@Before
		public void setup() {
		ExpandableNotificationRow rowMock = mock(ExpandableNotificationRow.class);
		when(rowMock.getIntrinsicHeight()).thenReturn(10);

		mContext = InstrumentationRegistry.getTargetContext();
		mView = new NotificationContentView(mContext, null);
		mView.setContainingNotification(rowMock);
		mView.setHeights(10, 20, 30, 40);

		mView.setContractedChild(createViewWithHeight(10));
		mView.setExpandedChild(createViewWithHeight(20));
		mView.setHeadsUpChild(createViewWithHeight(30));
		mView.setAmbientChild(createViewWithHeight(40));

		mView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
		mView.layout(0, 0, mView.getMeasuredWidth(), mView.getMeasuredHeight());
		}

		private View createViewWithHeight(int height) {
		View view = new View(mContext, null);
		view.setMinimumHeight(height);
		return view;
		}

		@Test
		@UiThreadTest
		public void animationStartType_getsClearedAfterUpdatingVisibilitiesWithoutAnimation() {
		mView.setHeadsUp(true);
		mView.setDark(true, false, 0);
		mView.setDark(false, true, 0);
		mView.setHeadsUpAnimatingAway(true);
		Assert.assertFalse(mView.isAnimatingVisibleType());
		}
		}