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

Commit e28295bb authored by Matt Pietal's avatar Matt Pietal
Browse files

Cleanup support for multiple PIN views 

Had to support both old/new UX for PIN for a while. Cleanup the
unneeded code and simply the ripple.

Fixes: 187340770
Test: atest KeyguardPinBasedInputViewControllerTest and visual check
Change-Id: Ie12cd93c7aaba5a3ef172792a5dd2a41f2196447
parent 006f1a69

packages/SystemUI/res-keyguard/drawable/num_pad_key_background.xml

+4 −13
Original line number Original line Diff line number Diff line
@@ -16,23 +16,14 @@ 
* limitations under the License.

* limitations under the License.

*/

*/

-->

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:id="@+id/background">

    <shape>

      <solid android:color="?android:attr/colorControlNormal" />

      <corners android:radius="10dp" />

    </shape>

  </item>

  <item android:id="@+id/ripple">

<ripple

<ripple

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    android:color="?android:attr/colorControlHighlight">

      <item android:id="@android:id/mask">

  <item android:id="@+id/background">

        <shape android:shape="rectangle">

    <shape>

      <solid android:color="?android:attr/colorControlNormal" />

      <solid android:color="?android:attr/colorControlNormal" />

      <corners android:radius="10dp" />

      <corners android:radius="10dp" />

    </shape>

    </shape>

  </item>

  </item>

</ripple>

</ripple>

  </item>

</layer-list>

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

+4 −9
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.util.ViewController;

import com.android.systemui.util.ViewController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -167,7 +166,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
        private final TelephonyManager mTelephonyManager;

        private final TelephonyManager mTelephonyManager;

        private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;

        private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;

        private final FalsingCollector mFalsingCollector;

        private final FalsingCollector mFalsingCollector;

        private final boolean mIsNewLayoutEnabled;





        @Inject

        @Inject

        public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,

        public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -177,8 +175,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                InputMethodManager inputMethodManager, @Main DelayableExecutor mainExecutor,

                InputMethodManager inputMethodManager, @Main DelayableExecutor mainExecutor,

                @Main Resources resources, LiftToActivateListener liftToActivateListener,

                @Main Resources resources, LiftToActivateListener liftToActivateListener,

                TelephonyManager telephonyManager, FalsingCollector falsingCollector,

                TelephonyManager telephonyManager, FalsingCollector falsingCollector,

                EmergencyButtonController.Factory emergencyButtonControllerFactory,

                EmergencyButtonController.Factory emergencyButtonControllerFactory) {

                FeatureFlags featureFlags) {

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mLockPatternUtils = lockPatternUtils;

            mLockPatternUtils = lockPatternUtils;

            mLatencyTracker = latencyTracker;

            mLatencyTracker = latencyTracker;
@@ -190,7 +187,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
            mTelephonyManager = telephonyManager;

            mTelephonyManager = telephonyManager;

            mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;

            mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;

            mFalsingCollector = falsingCollector;

            mFalsingCollector = falsingCollector;

            mIsNewLayoutEnabled = featureFlags.isKeyguardLayoutEnabled();

        }

        }





        /** Create a new {@link KeyguardInputViewController}. */

        /** Create a new {@link KeyguardInputViewController}. */
@@ -216,20 +212,19 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,

                return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, emergencyButtonController, mFalsingCollector,

                        mLiftToActivateListener, emergencyButtonController, mFalsingCollector);

                        mIsNewLayoutEnabled);

            } else if (keyguardInputView instanceof KeyguardSimPinView) {

            } else if (keyguardInputView instanceof KeyguardSimPinView) {

                return new KeyguardSimPinViewController((KeyguardSimPinView) keyguardInputView,

                return new KeyguardSimPinViewController((KeyguardSimPinView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        emergencyButtonController, mIsNewLayoutEnabled);

                        emergencyButtonController);

            } else if (keyguardInputView instanceof KeyguardSimPukView) {

            } else if (keyguardInputView instanceof KeyguardSimPukView) {

                return new KeyguardSimPukViewController((KeyguardSimPukView) keyguardInputView,

                return new KeyguardSimPukViewController((KeyguardSimPukView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        emergencyButtonController, mIsNewLayoutEnabled);

                        emergencyButtonController);

            }

            }





            throw new RuntimeException("Unable to find controller for " + keyguardInputView);

            throw new RuntimeException("Unable to find controller for " + keyguardInputView);

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -168,20 +168,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
        return mButtons;

        return mButtons;

    }

    }





    /**

     * By default, the new layout will be enabled. When false, revert to the old style.

     */

    public void setIsNewLayoutEnabled(boolean isEnabled) {

        if (!isEnabled) {

            for (int i = 0; i < mButtons.length; i++) {

                mButtons[i].disableNewLayout();

            }

            mDeleteButton.disableNewLayout();

            mOkButton.disableNewLayout();

            reloadColors();

        }

    }



    /**

    /**

     * Reload colors from resources.

     * Reload colors from resources.

     **/

     **/

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,12 +35,11 @@ public class KeyguardPinViewController 
            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,

            LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,

            EmergencyButtonController emergencyButtonController,

            EmergencyButtonController emergencyButtonController,

            FalsingCollector falsingCollector, boolean isNewLayoutEnabled) {

            FalsingCollector falsingCollector) {

        super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,

        super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                emergencyButtonController, falsingCollector);

                emergencyButtonController, falsingCollector);

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        view.setIsNewLayoutEnabled(isNewLayoutEnabled);

    }

    }





    @Override

    @Override

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -79,14 +79,13 @@ public class KeyguardSimPinViewController 
            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,

            LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,

            TelephonyManager telephonyManager, FalsingCollector falsingCollector,

            TelephonyManager telephonyManager, FalsingCollector falsingCollector,

            EmergencyButtonController emergencyButtonController, boolean isNewLayoutEnabled) {

            EmergencyButtonController emergencyButtonController) {

        super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,

        super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                emergencyButtonController, falsingCollector);

                emergencyButtonController, falsingCollector);

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mTelephonyManager = telephonyManager;

        mTelephonyManager = telephonyManager;

        mSimImageView = mView.findViewById(R.id.keyguard_sim);

        mSimImageView = mView.findViewById(R.id.keyguard_sim);

        view.setIsNewLayoutEnabled(isNewLayoutEnabled);

    }

    }





    @Override

    @Override