Merge "Remove keyguard state callback onViewDetached." into sc-dev (d232ab98) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -79,18 +79,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
		dozeParameters, unlockedScreenOffAnimationController, /* animateYPos= */ true);
		mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
		mSmartspaceTransitionController = smartspaceTransitionController;

		mKeyguardStateController.addCallback(new KeyguardStateController.Callback() {
		@Override
		public void onKeyguardShowingChanged() {
		// If we explicitly re-show the keyguard, make sure that all the child views are
		// visible. They might have been animating out as part of the SmartSpace shared
		// element transition.
		if (keyguardStateController.isShowing()) {
		mView.setChildrenAlphaExcludingClockView(1f);
		}
		}
		});
		}

		@Override
		@@ -102,12 +90,14 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
		protected void onViewAttached() {
		mKeyguardUpdateMonitor.registerCallback(mInfoCallback);
		mConfigurationController.addCallback(mConfigurationListener);
		mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);
		}

		@Override
		protected void onViewDetached() {
		mKeyguardUpdateMonitor.removeCallback(mInfoCallback);
		mConfigurationController.removeCallback(mConfigurationListener);
		mKeyguardStateController.removeCallback(mKeyguardStateControllerCallback);
		}

		/**
		@@ -276,6 +266,19 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
		}
		};

		private KeyguardStateController.Callback mKeyguardStateControllerCallback =
		new KeyguardStateController.Callback() {
		@Override
		public void onKeyguardShowingChanged() {
		// If we explicitly re-show the keyguard, make sure that all the child views are
		// visible. They might have been animating out as part of the SmartSpace shared
		// element transition.
		if (mKeyguardStateController.isShowing()) {
		mView.setChildrenAlphaExcludingClockView(1f);
		}
		}
		};

		/**
		* Rect that specifies how KSV should be clipped, on its parent's coordinates.
		*/