am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev (3ef8f64d) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -594,13 +594,12 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		animateOutlinesAndSidePages(false);
		}

		public void showInitialPageHints() {
		mShowingInitialHints = true;
		void updateChildrenContentAlpha(float sidePageAlpha) {
		int count = getChildCount();
		for (int i = 0; i < count; i++) {
		KeyguardWidgetFrame child = getWidgetPageAt(i);
		if (i != mCurrentPage) {
		child.setBackgroundAlpha(KeyguardWidgetFrame.OUTLINE_ALPHA_MULTIPLIER);
		child.setBackgroundAlpha(sidePageAlpha);
		child.setContentAlpha(0f);
		} else {
		child.setBackgroundAlpha(0f);
		@@ -609,9 +608,15 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		}
		}

		public void showInitialPageHints() {
		mShowingInitialHints = true;
		updateChildrenContentAlpha(KeyguardWidgetFrame.OUTLINE_ALPHA_MULTIPLIER);
		}

		@Override
		void setCurrentPage(int currentPage) {
		super.setCurrentPage(currentPage);
		updateChildrenContentAlpha(0.0f);
		updateWidgetFramesImportantForAccessibility();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
		@Override
		public void onChildViewRemoved(View parent, View child) {
		mForceScreenScrolled = true;
		invalidate();
		invalidateCachedOffsets();
		}

		protected void invalidateCachedOffsets() {