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

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

+10 −4

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