am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed (9633ea97) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package com.android.internal.policy.impl.keyguard;

		import android.os.Handler;
		import android.os.Looper;
		import android.util.Log;
		import android.view.View;

		public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChallengeScrolledListener {
		@@ -29,6 +28,7 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle
		private KeyguardSecurityView mKeyguardSecurityContainer;
		private int[] mTmpPoint = new int[2];
		private static final int SCREEN_ON_HINT_DURATION = 1000;
		private static final int SCREEN_ON_RING_HINT_DELAY = 300;
		Handler mMainQueue = new Handler(Looper.myLooper());

		int mChallengeTop = 0;
		@@ -147,7 +147,12 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle
		}

		public void showUsabilityHints() {
		mMainQueue.postDelayed( new Runnable() {
		@Override
		public void run() {
		mKeyguardSecurityContainer.showUsabilityHint();
		}
		} , SCREEN_ON_RING_HINT_DELAY);
		mPagedView.showInitialPageHints();
		mHideHintsRunnable = new Runnable() {
		@Override

+2 −8

Original line number	Diff line number	Diff line
		@@ -255,7 +255,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit

		@Override
		protected void onPageBeginMoving() {
		enablePageLayers();
		if (mViewStateManager != null) {
		mViewStateManager.onPageBeginMoving();
		}
		@@ -416,6 +415,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		}

		void showOutlinesAndSidePages() {
		enablePageLayers();
		animateOutlinesAndSidePages(true);
		}

		@@ -424,13 +424,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		}

		public void showInitialPageHints() {
		// We start with everything showing
		setChildrenOutlineAlpha(1.0f);
		setSidePagesAlpha(1.0f);

		int currPage = getCurrentPage();
		KeyguardWidgetFrame frame = getWidgetPageAt(currPage);
		frame.setBackgroundAlpha(0f);
		showOutlinesAndSidePages();
		}

		void animateOutlinesAndSidePages(final boolean show) {