Merge "Enable fast camera transition when launched from navbar" into klp-dev (3714473f) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
		private FixedSizeFrameLayout mPreview;
		private View mFullscreenPreview;
		private View mFakeNavBar;
		private boolean mUseFastTransition;

		private final Runnable mTransitionToCameraRunnable = new Runnable() {
		@Override
		@@ -417,7 +418,8 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
		private void rescheduleTransitionToCamera() {
		if (DEBUG) Log.d(TAG, "rescheduleTransitionToCamera at " + SystemClock.uptimeMillis());
		mHandler.removeCallbacks(mTransitionToCameraRunnable);
		mHandler.postDelayed(mTransitionToCameraRunnable, WIDGET_WAIT_DURATION);
		final long duration = mUseFastTransition ? 0 : WIDGET_WAIT_DURATION;
		mHandler.postDelayed(mTransitionToCameraRunnable, duration);
		}

		private void cancelTransitionToCamera() {
		@@ -512,4 +514,8 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
		if (DEBUG) Log.d(TAG, "setInsets: " + insets);
		mInsets.set(insets);
		}

		public void setUseFastTransition(boolean useFastTransition) {
		mUseFastTransition = useFastTransition;
		}
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,10 @@ public class KeyguardViewStateManager implements
		public void onPageSwitching(View newPage, int newPageIndex) {
		if (mKeyguardWidgetPager != null && mChallengeLayout instanceof SlidingChallengeLayout) {
		boolean isCameraPage = newPage instanceof CameraWidgetFrame;
		if (isCameraPage) {
		CameraWidgetFrame camera = (CameraWidgetFrame) newPage;
		camera.setUseFastTransition(mKeyguardWidgetPager.isWarping());
		}
		SlidingChallengeLayout scl = (SlidingChallengeLayout) mChallengeLayout;
		scl.setChallengeInteractive(!isCameraPage);
		final int currentFlags = mKeyguardWidgetPager.getSystemUiVisibility();

+3 −1

Original line number	Diff line number	Diff line
		@@ -1938,10 +1938,12 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc

		if (isWarping()) {
		dispatchOnPageEndWarp();
		notifyPageSwitching(whichPage);
		resetPageWarp();
		} else {
		notifyPageSwitching(whichPage);
		}

		notifyPageSwitching(whichPage);
		View focusedChild = getFocusedChild();
		if (focusedChild != null && whichPage != mCurrentPage &&
		focusedChild == getPageAt(mCurrentPage)) {