Merge "Fix Accessibility Shortcut does not show up while SystemUI restart" into tm-dev

    private int mBtnMode;

    private String mBtnTargets;

    private boolean mIsKeyguardVisible;

    private boolean mIsAccessibilityManagerServiceReady;

    @VisibleForTesting

    final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() {

        // Accessibility floating menu needs to retrieve information from

        // AccessibilityManagerService, and it would be ready before onUserUnlocked().

        @Override

        public void onUserUnlocked() {

            mIsAccessibilityManagerServiceReady = true;

            handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

        }

        // Keyguard state would be changed before AccessibilityManagerService is ready to retrieve,

        // need to wait until receive onUserUnlocked().

        @Override

        public void onKeyguardVisibilityChanged(boolean showing) {

            mIsKeyguardVisible = showing;

            if (mIsAccessibilityManagerServiceReady) {

            handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);

        }

        }

        @Override

        public void onUserSwitching(int userId) {

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mIsKeyguardVisible = false;

        mIsAccessibilityManagerServiceReady = false;

    }

    /**