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

Commit 9d5ad854 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

Merge "Revert "Workaround SysUI crash with incorrect Context for Theme.""

parents bce8d161 cab0fbea
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ public class KeyguardDisplayManager {
        private static final int VIDEO_SAFE_REGION = 80; // Percentage of display width & height
        private static final int MOVE_CLOCK_TIMEOUT = 10000; // 10s
        private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
        private final Context mContext;
        private KeyguardClockSwitchController mKeyguardClockSwitchController;
        private View mClock;
        private int mUsableWidth;
@@ -286,7 +285,6 @@ public class KeyguardDisplayManager {
                    WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
            mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;
            setCancelable(false);
            mContext = context;
        }

        @Override
@@ -311,7 +309,7 @@ public class KeyguardDisplayManager {

            updateBounds();

            setContentView(LayoutInflater.from(mContext)
            setContentView(LayoutInflater.from(getContext())
                    .inflate(R.layout.keyguard_presentation, null));

            // Logic to make the lock screen fullscreen