Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Wren
2012-10-30 08:20:36 -07:00
committed by Android (Google) Code Review
parent cf69c56b83 32c557cea2
commit 16d83fd13a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
View File

@@ -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