Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev (7988ef9c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -2280,8 +2280,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		updateContentHeight();
		notifyHeightChangeListener(mDismissView);
		} else {
		mEmptyShadeView.setWillBeGone(true);
		mEmptyShadeView.performVisibilityAnimation(false, new Runnable() {
		Runnable onFinishedRunnable = new Runnable() {
		@Override
		public void run() {
		mEmptyShadeView.setVisibility(GONE);
		@@ -2289,7 +2288,14 @@ public class NotificationStackScrollLayout extends ViewGroup
		updateContentHeight();
		notifyHeightChangeListener(mDismissView);
		}
		});
		};
		if (mAnimationsEnabled) {
		mEmptyShadeView.setWillBeGone(true);
		mEmptyShadeView.performVisibilityAnimation(false, onFinishedRunnable);
		} else {
		mEmptyShadeView.setInvisible();
		onFinishedRunnable.run();
		}
		}
		}
		}
		@@ -2318,7 +2324,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		notifyHeightChangeListener(mDismissView);
		}
		};
		if (mDismissView.isButtonVisible() && mIsExpanded) {
		if (mDismissView.isButtonVisible() && mIsExpanded && mAnimationsEnabled) {
		mDismissView.setWillBeGone(true);
		mDismissView.performVisibilityAnimation(false, dimissHideFinishRunnable);
		} else {