diff options
author | Adam Cohen <adamcohen@google.com> | 2012-11-08 01:03:49 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 01:03:50 -0800 |
commit | c8ed8d32603d21e1af9a682cc5f1655d2388cfba (patch) | |
tree | 6b3198d9ba351ce0e0dbee3796686f7d5e0735bd | |
parent | e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc (diff) | |
parent | 08c83ef48880b98ec45dd83867a29852160a96eb (diff) | |
download | base-c8ed8d32603d21e1af9a682cc5f1655d2388cfba.tar.gz |
Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 20 | ||||
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java | 8 |
2 files changed, 22 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 368cfcebc9db..8487f028a2d2 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -306,19 +306,27 @@ public class KeyguardHostView extends KeyguardViewBase { = new KeyguardWidgetPager.Callbacks() { @Override public void userActivity() { - if (mViewMediatorCallback != null) { - mViewMediatorCallback.userActivity(); - } + KeyguardHostView.this.userActivity(); } @Override public void onUserActivityTimeoutChanged() { - if (mViewMediatorCallback != null) { - mViewMediatorCallback.onUserActivityTimeoutChanged(); - } + KeyguardHostView.this.onUserActivityTimeoutChanged(); } }; + public void userActivity() { + if (mViewMediatorCallback != null) { + mViewMediatorCallback.userActivity(); + } + } + + public void onUserActivityTimeoutChanged() { + if (mViewMediatorCallback != null) { + mViewMediatorCallback.onUserActivityTimeoutChanged(); + } + } + @Override public long getUserActivityTimeout() { // Currently only considering user activity timeouts needed by widgets. diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java index 945e9c2ff065..0a166e17058d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java @@ -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); } |