Merge "Smartspace in wrong position" into sc-dev (08ba30a5) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -64,9 +64,10 @@ public class KeyguardClockSwitch extends RelativeLayout {
		private float mDarkAmount;

		/**
		* Boolean value indicating if notifications are visible on lock screen.
		* Boolean value indicating if notifications are visible on lock screen. Use null to signify
		* it is uninitialized.
		*/
		private boolean mHasVisibleNotifications = true;
		private Boolean mHasVisibleNotifications = null;

		private AnimatorSet mClockInAnim = null;
		private AnimatorSet mClockOutAnim = null;
		@@ -263,7 +264,8 @@ public class KeyguardClockSwitch extends RelativeLayout {
		* the smaller version.
		*/
		boolean willSwitchToLargeClock(boolean hasVisibleNotifications) {
		if (hasVisibleNotifications == mHasVisibleNotifications) {
		if (mHasVisibleNotifications != null
		&& hasVisibleNotifications == mHasVisibleNotifications) {
		return false;
		}
		boolean useLargeClock = !hasVisibleNotifications;