Revert "Lockscreen : Ensure window bounds change after view animations" (b90fd3df) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −14

Original line number	Diff line number	Diff line
		@@ -465,10 +465,6 @@ public class NotificationPanelView extends PanelView implements
		} else {
		intercept = NotificationPanelView.this.onTouchEvent(e);
		}
		} else {
		// Ensure we expand as early as possible
		// to avoid any simultaneous animations on the views
		mKeyguardBottomArea.expand(true);
		}
		return intercept;
		}
		@@ -2321,22 +2317,14 @@ public class NotificationPanelView extends PanelView implements
		requestDisallowInterceptTouchEvent(true);
		mOnlyAffordanceInThisMotion = true;
		mQsTracking = false;
		mKeyguardBottomArea.expand(true);
		}

		@Override
		public void onSwipingAborted() {
		mKeyguardBottomArea.unbindCameraPrewarmService(false /* launched */);
		mKeyguardBottomArea.animate().setListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mKeyguardBottomArea.expand(false);
		}
		@Override
		public void onAnimationCancel(Animator animation) {
		mKeyguardBottomArea.expand(false);
		}
		});
		}

		@Override
		public void onIconClicked(boolean rightIcon) {

+1 −11

Original line number	Diff line number	Diff line
		@@ -4761,19 +4761,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		public void onHintFinished() {
		// Delay the reset a bit so the user can read the text.
		mKeyguardIndicationController.hideTransientIndicationDelayed(HINT_RESET_DELAY_MS);
		mKeyguardBottomArea.animate().setListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mKeyguardBottomArea.expand(false);
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		mKeyguardBottomArea.expand(false);
		}
		});
		}

		public void onCameraHintStarted(String hint) {
		mKeyguardIndicationController.showTransientIndication(hint);
		}