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

Commit ce803ecf authored by Roman Birg's avatar Roman Birg Committed by Brint E. Kriebel
Browse files

Revert "systemui: Fix KeyguardMonitor callbacks during configuration changes" 

This reverts commit 0beb0fca.

Change-Id: Ib8d5e1ba90a1ca4c48987a6232e3743d4ab4c8d8
(cherry picked from commit 2307241b)
parent ee73aa16

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

+2 −8
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                (ViewStub) mStatusBarWindowContent.findViewById(R.id.keyguard_user_switcher),

                mKeyguardStatusBar, mNotificationPanel, mUserSwitcherController);





        // Set up the quick settings tile panel

        mQSPanel = (QSPanel) mStatusBarWindowContent.findViewById(R.id.quick_settings_panel);

        if (mQSPanel != null) {
@@ -1221,10 +1222,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            });

        }



        if (mStatusBarWindowManager != null) {

            mStatusBarWindowManager.setKeyguardMonitor(mKeyguardMonitor);

        }



        // User info. Trigger first load.

        mHeader.setUserInfoController(mUserInfoController);

        mKeyguardStatusBar.setUserInfoController(mUserInfoController);
@@ -3507,8 +3504,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private void addStatusBarWindow() {

        makeStatusBarView();

        mStatusBarWindow.addContent(mStatusBarWindowContent);

        mStatusBarWindowManager = new StatusBarWindowManager(mContext);

        mStatusBarWindowManager.setKeyguardMonitor(mKeyguardMonitor);

        mStatusBarWindowManager = new StatusBarWindowManager(mContext, mKeyguardMonitor);

        mStatusBarWindowManager.add(mStatusBarWindow, getStatusBarHeight());

    }
@@ -3780,8 +3776,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // this MUST happen before makeStatusBarView();

        haltTicker();



        mKeyguardMonitor.removeCallbacks();



        makeStatusBarView();

        repositionNavigationBar();

        addHeadsUpView();

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

+5 −7
Original line number Diff line number Diff line
@@ -55,18 +55,21 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback { 
    private final SurfaceSession mFxSession;

    private final WindowManagerPolicy mPolicy = PolicyManager.makeNewWindowManager();



    private KeyguardMonitor mKeyguardMonitor;

    private final KeyguardMonitor mKeyguardMonitor;



    private static final int TYPE_LAYER_MULTIPLIER = 10000; // refer to WindowManagerService.TYPE_LAYER_MULTIPLIER

    private static final int TYPE_LAYER_OFFSET = 1000;      // refer to WindowManagerService.TYPE_LAYER_OFFSET



    private final State mCurrentState = new State();



    public StatusBarWindowManager(Context context) {

    public StatusBarWindowManager(Context context, KeyguardMonitor kgm) {

        mContext = context;

        mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);

        mKeyguardScreenRotation = shouldEnableKeyguardScreenRotation();



        mKeyguardMonitor = kgm;

        mKeyguardMonitor.addCallback(this);



        mKeyguardBlurEnabled = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_ui_blur_enabled);

        mFxSession = new SurfaceSession();
@@ -74,11 +77,6 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback { 
                          * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;

    }



    public void setKeyguardMonitor(KeyguardMonitor kgm) {

        mKeyguardMonitor = kgm;

        kgm.addCallback(this);

    }



    private boolean shouldEnableKeyguardScreenRotation() {

        Resources res = mContext.getResources();

        return SystemProperties.getBoolean("lockscreen.rot_override", false)

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ public final class KeyguardMonitor { 
        mCallbacks.add(callback);

    }



    public void removeCallbacks() {

        mCallbacks.clear();

    }



    public void removeCallback(Callback callback) {

        mCallbacks.remove(callback);

    }