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

Commit dcbffea7 authored by Jerry Chang's avatar Jerry Chang
Browse files

Revert "Support showing alignment hint based on aligniment state of dock" 

This reverts commit 43a49c83.

Reason for revert: Should be topic with the other changes

Change-Id: I84223ddd28a6b1bfc3fde27bc4af4940e0df3636
parent 43a49c83

packages/SystemUI/res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -986,12 +986,6 @@ 
    <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] -->

    <string name="keyguard_retry">Swipe up to try again</string>



    <!-- Indication when device is slow charging due to misalignment on the dock. [CHAR LIMIT=60] -->

    <string name="dock_alignment_slow_charging" product="default">Realign phone for faster charging</string>



    <!-- Indication when device is not charging due to bad placement on the dock. [CHAR LIMIT=60] -->

    <string name="dock_alignment_not_charging" product="default">Realign phone to charge wirelessly</string>



    <!-- Text on keyguard screen and in Quick Settings footer indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=60] -->

    <string name="do_disclosure_generic">This device is managed by your organization</string>

packages/SystemUI/src/com/android/systemui/dock/DockManager.java

+6 −47
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
package com.android.systemui.dock;



/**

 * Allows an app to handle dock events.

 * Allows an app to handle dock events

 */

public interface DockManager {



    /**

     * Uninitialized / undocking dock states.

     * Uninitialized / undocking dock states

     */

    int STATE_NONE = 0;

    /**
@@ -30,27 +30,12 @@ public interface DockManager { 
     */

    int STATE_DOCKED = 1;

    /**

     * The state for docking without showing UI.

     * The state for docking without showing UI

     */

    int STATE_DOCKED_HIDE = 2;



    /**

     * Indicates there's no alignment issue.

     */

    int ALIGN_STATE_GOOD = 0;



    /**

     * Indicates it's slightly not aligned with dock.

     */

    int ALIGN_STATE_POOR = 1;



    /**

     * Indicates it's not aligned with dock.

     */

    int ALIGN_STATE_TERRIBLE = 2;



    /**

     * Add a dock event listener into manager.

     * Add a dock event listener into manager

     *

     * @param callback A {@link DockEventListener} which want to add

     */
@@ -63,20 +48,6 @@ public interface DockManager { 
     */

    void removeListener(DockEventListener callback);



    /**

     * Add a alignment listener into manager.

     *

     * @param listener A {@link AlignmentStateListener} which want to add

     */

    void addAlignmentStateListener(AlignmentStateListener listener);



    /**

     * Remove the added alignment listener from dock manager.

     *

     * @param listener A {@link AlignmentStateListener} which want to remove

     */

    void removeAlignmentStateListener(AlignmentStateListener listener);



    /**

    * Returns true if the device is in docking state.

    */
@@ -87,23 +58,11 @@ public interface DockManager { 
     */

    boolean isHidden();



    /**

     * Listens to dock events.

     */

    /** Callback for receiving dock events */

    interface DockEventListener {

        /**

         * Override to handle dock events.

         * Override to handle dock events

         */

        void onEvent(int event);

    }



    /**

     * Listens to dock alignment state changed.

     */

    interface AlignmentStateListener {

        /**

         * Override to handle alignment state changes.

         */

        void onAlignmentStateChanged(int alignState);

    }

}

packages/SystemUI/src/com/android/systemui/dock/DockManagerImpl.java

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ public class DockManagerImpl implements DockManager { 
    public void removeListener(DockEventListener callback) {

    }



    @Override

    public void addAlignmentStateListener(AlignmentStateListener listener) {

    }



    @Override

    public void removeAlignmentStateListener(AlignmentStateListener listener) {

    }



    @Override

    public boolean isDocked() {

        return false;

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+3 −31
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import com.android.settingslib.Utils; 
import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.dock.DockManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;

import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;
@@ -96,7 +95,6 @@ public class KeyguardIndicationController implements StateListener, 
    private final IBatteryStats mBatteryInfo;

    private final SettableWakeLock mWakeLock;

    private final LockPatternUtils mLockPatternUtils;

    private final DockManager mDockManager;



    private final int mSlowThreshold;

    private final int mFastThreshold;
@@ -105,7 +103,6 @@ public class KeyguardIndicationController implements StateListener, 
    private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger();



    private String mRestingIndication;

    private String mAlignmentIndication;

    private CharSequence mTransientIndication;

    private ColorStateList mTransientTextColorState;

    private ColorStateList mInitialTextColorState;
@@ -143,8 +140,7 @@ public class KeyguardIndicationController implements StateListener, 
                Dependency.get(AccessibilityController.class),

                Dependency.get(KeyguardStateController.class),

                Dependency.get(StatusBarStateController.class),

                Dependency.get(KeyguardUpdateMonitor.class),

                Dependency.get(DockManager.class));

                Dependency.get(KeyguardUpdateMonitor.class));

    }



    /**
@@ -156,8 +152,7 @@ public class KeyguardIndicationController implements StateListener, 
            AccessibilityController accessibilityController,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            DockManager dockManager) {

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        mContext = context;

        mLockIcon = lockIcon;

        mShadeController = shadeController;
@@ -165,8 +160,6 @@ public class KeyguardIndicationController implements StateListener, 
        mKeyguardStateController = keyguardStateController;

        mStatusBarStateController = statusBarStateController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mDockManager = dockManager;

        mDockManager.addAlignmentStateListener(this::handleAlignStateChanged);

        // lock icon is not used on all form factors.

        if (mLockIcon != null) {

            mLockIcon.setOnLongClickListener(this::handleLockLongClick);
@@ -218,21 +211,6 @@ public class KeyguardIndicationController implements StateListener, 
        mShadeController.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

    }



    private void handleAlignStateChanged(int alignState) {

        String alignmentIndication = "";

        if (alignState == DockManager.ALIGN_STATE_POOR) {

            alignmentIndication =

                    mContext.getResources().getString(R.string.dock_alignment_slow_charging);

        } else if (alignState == DockManager.ALIGN_STATE_TERRIBLE) {

            alignmentIndication =

                    mContext.getResources().getString(R.string.dock_alignment_not_charging);

        }

        if (!alignmentIndication.equals(mAlignmentIndication)) {

            mAlignmentIndication = alignmentIndication;

            updateIndication(false);

        }

    }



    /**

     * Gets the {@link KeyguardUpdateMonitorCallback} instance associated with this

     * {@link KeyguardIndicationController}.
@@ -367,9 +345,6 @@ public class KeyguardIndicationController implements StateListener, 
                mTextView.setTextColor(Color.WHITE);

                if (!TextUtils.isEmpty(mTransientIndication)) {

                    mTextView.switchIndication(mTransientIndication);

                } else if (!TextUtils.isEmpty(mAlignmentIndication)) {

                    mTextView.switchIndication(mAlignmentIndication);

                    mTextView.setTextColor(Utils.getColorError(mContext));

                } else if (mPowerPluggedIn) {

                    String indication = computePowerIndication();

                    if (animate) {
@@ -398,9 +373,6 @@ public class KeyguardIndicationController implements StateListener, 
                    && mKeyguardUpdateMonitor.getUserHasTrust(userId)) {

                mTextView.switchIndication(trustGrantedIndication);

                mTextView.setTextColor(mInitialTextColorState);

            } else if (!TextUtils.isEmpty(mAlignmentIndication)) {

                mTextView.switchIndication(mAlignmentIndication);

                mTextView.setTextColor(Utils.getColorError(mContext));

            } else if (mPowerPluggedIn) {

                String indication = computePowerIndication();

                if (DEBUG_CHARGING_SPEED) {

packages/SystemUI/tests/src/com/android/systemui/dock/DockManagerFake.java

+0 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package com.android.systemui.dock; 
 */

public class DockManagerFake implements DockManager {

    DockEventListener mCallback;

    AlignmentStateListener mAlignmentListener;



    @Override

    public void addListener(DockEventListener callback) {
@@ -33,16 +32,6 @@ public class DockManagerFake implements DockManager { 
        this.mCallback = null;

    }



    @Override

    public void addAlignmentStateListener(AlignmentStateListener listener) {

        mAlignmentListener = listener;

    }



    @Override

    public void removeAlignmentStateListener(AlignmentStateListener listener) {

        mAlignmentListener = listener;

    }



    @Override

    public boolean isDocked() {

        return false;