Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev

Author: cwren

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

@@ -116,10 +116,7 @@ public void onPageSwitch(View newPage, int newPageIndex) {
         if (mPage != newPageIndex) {
             int oldPageIndex = mPage;
             mPage = newPageIndex;
-            if (mCallbacks != null) {
-                mCallbacks.onUserActivityTimeoutChanged();
-                mCallbacks.userActivity();
-            }
+            userActivity();
             KeyguardWidgetFrame oldWidgetPage = getWidgetPageAt(oldPageIndex);
             if (oldWidgetPage != null) {
                 oldWidgetPage.onActive(false);
@@ -134,6 +131,13 @@ public void onPageSwitch(View newPage, int newPageIndex) {
         }
     }
 
+    private void userActivity() {
+        if (mCallbacks != null) {
+            mCallbacks.onUserActivityTimeoutChanged();
+            mCallbacks.userActivity();
+        }
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
         KeyguardWidgetFrame currentWidgetPage = getWidgetPageAt(getCurrentPage());
@@ -269,6 +273,7 @@ protected void onPageBeginMoving() {
             mViewStateManager.onPageBeginMoving();
         }
         showOutlinesAndSidePages();
+        userActivity();
     }
 
     @Override