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

* commit 'f89ff85f6c408df6da8eea0fa9dc602352b3a4e4':
  Hide the camera and search icons when switching to the camera page
This commit is contained in:
Jim Miller
2013-10-13 17:46:10 -07:00
committed by Android Git Automerger

View File

@ -139,7 +139,13 @@ public class KeyguardViewStateManager implements
boolean isCameraPage = newPage instanceof CameraWidgetFrame; boolean isCameraPage = newPage instanceof CameraWidgetFrame;
SlidingChallengeLayout scl = (SlidingChallengeLayout) mChallengeLayout; SlidingChallengeLayout scl = (SlidingChallengeLayout) mChallengeLayout;
scl.setChallengeInteractive(!isCameraPage); 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 // If the page we're settling to is the same as we started on, and the action of