am 819a194: am 48b3e30: am c4c5622: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev

Adam Cohen · Android Git Automerger · commit 7684258b2165 · 2012-10-13T19:41:12.000-07:00
* commit '819a19476815a1f1ae719a0412719eb1bbef2aa6':
  Fix blank clock (issue 7344512)
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java
@@ -317,6 +317,7 @@ void setCurrentPage(int currentPage) {
             return;
         }
 
+        mForceScreenScrolled = true;
         mCurrentPage = Math.max(0, Math.min(currentPage, getPageCount() - 1));
         updateCurrentPageScroll();
         updateScrollingIndicator();

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,7 @@ void setCurrentPage(int currentPage) {`
`317`	`317`	`return;`
`318`	`318`	`}`
`319`	`319`
	`320`	`+ mForceScreenScrolled = true;`
`320`	`321`	`mCurrentPage = Math.max(0, Math.min(currentPage, getPageCount() - 1));`
`321`	`322`	`updateCurrentPageScroll();`
`322`	`323`	`updateScrollingIndicator();`