Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev

Browse Source
This commit is contained in:
Adam Powell
2012-11-05 15:52:42 -08:00
committed by Android (Google) Code Review
parent 79e0f87500 5a2c5f0efa
commit 9ff6d4f8db
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java
View File

@@ -485,6 +485,14 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
return; return;
} }
mChallengeShowing = showChallenge; mChallengeShowing = showChallenge;
if (mExpandChallengeView == null || mChallengeView == null) {
// These might not be here yet if we haven't been through layout.
// If we haven't, the first layout pass will set everything up correctly
// based on mChallengeShowing as set above.
return;
}
if (mChallengeShowing) { if (mChallengeShowing) {
mExpandChallengeView.setVisibility(View.INVISIBLE); mExpandChallengeView.setVisibility(View.INVISIBLE);
mChallengeView.setVisibility(View.VISIBLE); mChallengeView.setVisibility(View.VISIBLE);