Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev (c8ed8d32) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -305,19 +305,27 @@ public class KeyguardHostView extends KeyguardViewBase {
		private KeyguardWidgetPager.Callbacks mWidgetCallbacks
		= new KeyguardWidgetPager.Callbacks() {
		@Override
		public void userActivity() {
		KeyguardHostView.this.userActivity();
		}

		@Override
		public void onUserActivityTimeoutChanged() {
		KeyguardHostView.this.onUserActivityTimeoutChanged();
		}
		};

		public void userActivity() {
		if (mViewMediatorCallback != null) {
		mViewMediatorCallback.userActivity();
		}
		}

		@Override
		public void onUserActivityTimeoutChanged() {
		if (mViewMediatorCallback != null) {
		mViewMediatorCallback.onUserActivityTimeoutChanged();
		}
		}
		};

		@Override
		public long getUserActivityTimeout() {

+8 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,13 @@ public class KeyguardViewStateManager implements
		pt[1] += y - vY;
		}

		private void userActivity() {
		if (mKeyguardHostView != null) {
		mKeyguardHostView.onUserActivityTimeoutChanged();
		mKeyguardHostView.userActivity();
		}
		}

		@Override
		public void onScrollStateChanged(int scrollState) {
		if (mKeyguardWidgetPager == null \|\| mChallengeLayout == null) return;
		@@ -217,6 +224,7 @@ public class KeyguardViewStateManager implements
		if (!challengeOverlapping) {
		if (!mKeyguardWidgetPager.isPageMoving()) {
		frame.resetSize();
		userActivity();
		} else {
		mKeyguardWidgetPager.setWidgetToResetOnPageFadeOut(mPageListeningToSlider);
		}