From eec4fe2cbe20174ac3b60f0ca90b51271ea98751 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 7 Nov 2012 18:07:15 -0800 Subject: [PATCH] Use stable layouts for keyguard/SlidingChallengeLayout When coming back from the secure camera we will be transitioning from fullscreen back to not-fullscreen with regard to the status bar. Flag SlidingChallengeLayout to force the window to have stable insets so that our layout doesn't jump around during this transition. Set the same flag in MultiPaneChallengeLayout as well so that similar cases with other activities are also covered. Bug 7498950 Change-Id: I1b65e04d1404e764ddad29472b70cf791d6801f9 --- .../internal/policy/impl/keyguard/MultiPaneChallengeLayout.java | 2 ++ .../internal/policy/impl/keyguard/SlidingChallengeLayout.java | 1 + 2 files changed, 3 insertions(+) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java index f4940a2ff3d87..64c549fdc9f9a 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java @@ -77,6 +77,8 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo final Resources res = getResources(); mDisplayMetrics = res.getDisplayMetrics(); + + setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_STABLE); } @Override diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index 6d7d0f03c6f6e..c734423bb08f2 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -260,6 +260,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout mChallengeBottomBound = res.getDimensionPixelSize(R.dimen.kg_widget_pager_bottom_padding); setWillNotDraw(false); + setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_STABLE); } public void setHandleAlpha(float alpha) {