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

Commit b8b5aa4e authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove Dependency.get from KeyguardStatusView. 

Bug: 179775696
Test: atest SystemUITests && manual
Change-Id: Ifbb93e624d839d7506b45da2cabb4fcf8b0b75ff
parent 000e4071

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

+2 −17
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.widget.TextView; 
import androidx.core.graphics.ColorUtils;



import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.Dependency;

import com.android.systemui.R;



import java.io.FileDescriptor;
@@ -56,7 +55,6 @@ public class KeyguardStatusView extends GridLayout { 
    private final IActivityManager mIActivityManager;



    private TextView mLogoutView;

    private boolean mCanShowLogout = true; // by default, try to show the logout button here

    private KeyguardClockSwitch mClockView;

    private TextView mOwnerInfo;

    private boolean mCanShowOwnerInfo = true; // by default, try to show the owner information here
@@ -130,11 +128,6 @@ public class KeyguardStatusView extends GridLayout { 
        }

    }



    void setCanShowLogout(boolean canShowLogout) {

        mCanShowLogout = canShowLogout;

        updateLogoutView();

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();
@@ -159,10 +152,7 @@ public class KeyguardStatusView extends GridLayout { 
        mKeyguardSlice.setContentChangeListener(this::onSliceContentChanged);

        onSliceContentChanged();



        boolean shouldMarquee = Dependency.get(KeyguardUpdateMonitor.class).isDeviceInteractive();

        setEnableMarquee(shouldMarquee);

        updateOwnerInfo();

        updateLogoutView();

        updateDark();

    }
@@ -209,11 +199,11 @@ public class KeyguardStatusView extends GridLayout { 
        return mOwnerInfo.getVisibility() == VISIBLE ? mOwnerInfo.getHeight() : 0;

    }



    void updateLogoutView() {

    void updateLogoutView(boolean shouldShowLogout) {

        if (mLogoutView == null) {

            return;

        }

        mLogoutView.setVisibility(mCanShowLogout && shouldShowLogout() ? VISIBLE : GONE);

        mLogoutView.setVisibility(shouldShowLogout ? VISIBLE : GONE);

        // Logout button will stay in language of user 0 if we don't set that manually.

        mLogoutView.setText(mContext.getResources().getString(

                com.android.internal.R.string.global_action_logout));
@@ -313,11 +303,6 @@ public class KeyguardStatusView extends GridLayout { 
        }

    }



    private boolean shouldShowLogout() {

        return Dependency.get(KeyguardUpdateMonitor.class).isLogoutEnabled()

                && KeyguardUpdateMonitor.getCurrentUser() != UserHandle.USER_SYSTEM;

    }



    private void onLogoutClicked(View view) {

        int currentUserId = KeyguardUpdateMonitor.getCurrentUser();

        try {

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+13 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.keyguard;



import android.os.UserHandle;

import android.util.Slog;

import android.view.View;
@@ -78,6 +79,8 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
    @Override

    public void onInit() {

        mKeyguardClockSwitchController.init();

        mView.setEnableMarquee(mKeyguardUpdateMonitor.isDeviceInteractive());

        mView.updateLogoutView(shouldShowLogout());

    }



    @Override
@@ -245,6 +248,11 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        }

    }



    private boolean shouldShowLogout() {

        return mKeyguardUpdateMonitor.isLogoutEnabled()

                && KeyguardUpdateMonitor.getCurrentUser() != UserHandle.USER_SYSTEM;

    }



    private final ConfigurationController.ConfigurationListener mConfigurationListener =

            new ConfigurationController.ConfigurationListener() {

        @Override
@@ -271,12 +279,12 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
                mKeyguardSliceViewController.updateTopMargin(

                        mKeyguardClockSwitchController.getClockTextTopPadding());

                mView.setCanShowOwnerInfo(false);

                mView.setCanShowLogout(false);

                mView.updateLogoutView(false);

            } else {

                // reset margin

                mKeyguardSliceViewController.updateTopMargin(0);

                mView.setCanShowOwnerInfo(true);

                mView.setCanShowLogout(false);

                mView.updateLogoutView(false);

            }

            updateAodIcons();

        }
@@ -302,7 +310,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
                if (DEBUG) Slog.v(TAG, "refresh statusview showing:" + showing);

                refreshTime();

                mView.updateOwnerInfo();

                mView.updateLogoutView();

                mView.updateLogoutView(shouldShowLogout());

            }

        }
@@ -320,12 +328,12 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        public void onUserSwitchComplete(int userId) {

            mKeyguardClockSwitchController.refreshFormat();

            mView.updateOwnerInfo();

            mView.updateLogoutView();

            mView.updateLogoutView(shouldShowLogout());

        }



        @Override

        public void onLogoutEnabledChanged() {

            mView.updateLogoutView();

            mView.updateLogoutView(shouldShowLogout());

        }

    };

}