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

Commit 28dc64b8 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev

parents 308b1a66 ea06c3ed
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ public class KeyguardHostView extends KeyguardViewBase {
    protected void onAttachedToWindow() {
        super.onAttachedToWindow();
        mAppWidgetHost.startListening();
        maybePopulateWidgets();
        // TODO: Re-enable when we have layouts that can support a better variety of widgets.
        // maybePopulateWidgets();
        disableStatusViewInteraction();
        post(mSwitchPageRunnable);
    }
@@ -643,11 +644,7 @@ public class KeyguardHostView extends KeyguardViewBase {
        if (securityMode == SecurityMode.None) {
            // Discard current runnable if we're switching back to the selector view
            setOnDismissRunnable(null);
            setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
        } else {
            setSystemUiVisibility(getSystemUiVisibility() & (~View.STATUS_BAR_DISABLE_BACK));
        } 

        mCurrentSecuritySelection = securityMode;
    }