Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1dd607 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not... 

am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev

* commit 'd811f27f':
  Keyguard sanity checks for when layout is not yet complete
parents eead9274 d811f27f

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -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);