Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev

Author: Adam Cohen

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

@@ -306,19 +306,27 @@ void addWidget(AppWidgetHostView view, int pageIndex) {
             = 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.

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

@@ -204,6 +204,13 @@ private void mapPoint(View fromView, View toView, int pt[]) {
         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 void onScrollStateChanged(int scrollState) {
             if (!challengeOverlapping) {
                 if (!mKeyguardWidgetPager.isPageMoving()) {
                     frame.resetSize();
+                    userActivity();
                 } else {
                     mKeyguardWidgetPager.setWidgetToResetOnPageFadeOut(mPageListeningToSlider);
                 }