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

Commit b13d7548 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary layout request from Keyguard" into lmp-preview-dev

parents 7d7090d6 818301b5

packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java

+0 −5
Original line number Diff line number Diff line
@@ -237,11 +237,6 @@ public abstract class KeyguardViewBase extends FrameLayout implements SecurityCa 
        if (DEBUG) Log.d(TAG, "screen on, instance " + Integer.toHexString(hashCode()));

        mSecurityContainer.showPrimarySecurityScreen(false);

        mSecurityContainer.onResume(KeyguardSecurityView.SCREEN_ON);



        // This is a an attempt to fix bug 7137389 where the device comes back on but the entire

        // layout is blank but forcing a layout causes it to reappear (e.g. with with

        // hierarchyviewer).

        requestLayout();

        requestFocus();

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ public class KeyguardBouncer { 
        // Keyguard. If we need to authenticate, show the bouncer.

        if (!mKeyguardView.dismiss()) {

            mRoot.setVisibility(View.VISIBLE);

            mKeyguardView.requestFocus();

            mKeyguardView.onResume();

        }

    }