Merge "Hide the camera and search icons when switching to the camera page" into klp-dev

This commit is contained in:
Jim Miller
2013-10-14 00:44:12 +00:00
committed by Android (Google) Code Review

View File

@ -139,7 +139,13 @@ public class KeyguardViewStateManager implements
boolean isCameraPage = newPage instanceof CameraWidgetFrame;
SlidingChallengeLayout scl = (SlidingChallengeLayout) mChallengeLayout;
scl.setChallengeInteractive(!isCameraPage);
if (isCameraPage) scl.fadeOutChallenge();
if (isCameraPage) {
scl.fadeOutChallenge();
}
final int currentFlags = mKeyguardWidgetPager.getSystemUiVisibility();
final int newFlags = isCameraPage ? (currentFlags | View.STATUS_BAR_DISABLE_SEARCH)
: (currentFlags & ~View.STATUS_BAR_DISABLE_SEARCH);
mKeyguardWidgetPager.setSystemUiVisibility(newFlags);
}
// If the page we're settling to is the same as we started on, and the action of