Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev (16d83fd1) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -116,10 +116,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		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 class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		}
		}

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

		@Override
		public boolean onTouchEvent(MotionEvent ev) {
		KeyguardWidgetFrame currentWidgetPage = getWidgetPageAt(getCurrentPage());
		@@ -269,6 +273,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		mViewStateManager.onPageBeginMoving();
		}
		showOutlinesAndSidePages();
		userActivity();
		}

		@Override