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

Commit 51c0526f authored by Joshua Mokut's avatar Joshua Mokut
Browse files

Pin focus field redone to adhere to sysui arch 

Removed dependency on KeyboardRepository from Keyguard UI layer
and replaced this with KeyguardKeyboardInteractor to adhere to go/sysui-arch

Test: NA
Fixes: 316106516
Flag: NA
Change-Id: Icbb0ef333ed2ff2a368388dc56ea0a3e1dc562f7
parent 3562e45e

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.test.filters.SmallTest; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.classifier.FalsingCollectorFake;
@@ -102,13 +103,15 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase { 
                .thenReturn(mOkButton);



        when(mPinBasedInputView.getResources()).thenReturn(getContext().getResources());

        KeyguardKeyboardInteractor keyguardKeyboardInteractor =

                new KeyguardKeyboardInteractor(new FakeKeyboardRepository());

        FakeFeatureFlags featureFlags = new FakeFeatureFlags();

        mSetFlagsRule.enableFlags(com.android.systemui.Flags.FLAG_REVAMPED_BOUNCER_MESSAGES);

        mKeyguardPinViewController = new KeyguardPinBasedInputViewController(mPinBasedInputView,

                mKeyguardUpdateMonitor, mSecurityMode, mLockPatternUtils, mKeyguardSecurityCallback,

                mKeyguardMessageAreaControllerFactory, mLatencyTracker, mLiftToactivateListener,

                mEmergencyButtonController, mFalsingCollector, featureFlags,

                mSelectedUserInteractor, new FakeKeyboardRepository()) {

                mSelectedUserInteractor, keyguardKeyboardInteractor) {

            @Override

            public void onResume(int reason) {

                super.onResume(reason);

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

+4 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.bouncer.ui.binder.BouncerMessageViewBinder; 
import com.android.systemui.classifier.FalsingCollector;

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

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyboard.data.repository.KeyboardRepository;

import com.android.systemui.log.BouncerLogger;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.policy.DevicePostureController;
@@ -212,7 +211,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
        private final FeatureFlags mFeatureFlags;

        private final SelectedUserInteractor mSelectedUserInteractor;

        private final UiEventLogger mUiEventLogger;

        private final KeyboardRepository mKeyboardRepository;

        private final KeyguardKeyboardInteractor mKeyguardKeyboardInteractor;



        @Inject
@@ -228,7 +226,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                KeyguardViewController keyguardViewController,

                FeatureFlags featureFlags, SelectedUserInteractor selectedUserInteractor,

                UiEventLogger uiEventLogger,

                KeyboardRepository keyboardRepository,

                KeyguardKeyboardInteractor keyguardKeyboardInteractor) {

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mLockPatternUtils = lockPatternUtils;
@@ -246,7 +243,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
            mFeatureFlags = featureFlags;

            mSelectedUserInteractor = selectedUserInteractor;

            mUiEventLogger = uiEventLogger;

            mKeyboardRepository = keyboardRepository;

            mKeyguardKeyboardInteractor = keyguardKeyboardInteractor;

        }
@@ -277,7 +273,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, emergencyButtonController, mFalsingCollector,

                        mDevicePostureController, mFeatureFlags, mSelectedUserInteractor,

                        mUiEventLogger, mKeyboardRepository

                        mUiEventLogger, mKeyguardKeyboardInteractor

                );

            } else if (keyguardInputView instanceof KeyguardSimPinView) {

                return new KeyguardSimPinViewController((KeyguardSimPinView) keyguardInputView,
@@ -285,14 +281,15 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        emergencyButtonController, mFeatureFlags, mSelectedUserInteractor,

                        mKeyboardRepository);

                        mKeyguardKeyboardInteractor);

            } else if (keyguardInputView instanceof KeyguardSimPukView) {

                return new KeyguardSimPukViewController((KeyguardSimPukView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager, mFalsingCollector,

                        emergencyButtonController, mFeatureFlags, mSelectedUserInteractor,

                        mKeyboardRepository);

                        mKeyguardKeyboardInteractor

                );

            }



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

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

+6 −6
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.keyguard;



import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;

import static com.android.systemui.Flags.pinInputFieldStyledFocusState;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.graphics.drawable.GradientDrawable;

import android.graphics.drawable.StateListDrawable;
@@ -32,9 +32,9 @@ import android.view.ViewGroup; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyboard.data.repository.KeyboardRepository;

import com.android.systemui.res.R;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
@@ -43,7 +43,7 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 


    private final LiftToActivateListener mLiftToActivateListener;

    private final FalsingCollector mFalsingCollector;

    private final KeyboardRepository mKeyboardRepository;

    private final KeyguardKeyboardInteractor mKeyguardKeyboardInteractor;

    protected PasswordTextView mPasswordEntry;



    private final OnKeyListener mOnKeyListener = (v, keyCode, event) -> {
@@ -75,13 +75,13 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 
            FalsingCollector falsingCollector,

            FeatureFlags featureFlags,

            SelectedUserInteractor selectedUserInteractor,

            KeyboardRepository keyboardRepository) {

            KeyguardKeyboardInteractor keyguardKeyboardInteractor) {

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

                messageAreaControllerFactory, latencyTracker, falsingCollector,

                emergencyButtonController, featureFlags, selectedUserInteractor);

        mLiftToActivateListener = liftToActivateListener;

        mFalsingCollector = falsingCollector;

        mKeyboardRepository = keyboardRepository;

        mKeyguardKeyboardInteractor = keyguardKeyboardInteractor;

        mPasswordEntry = mView.findViewById(mView.getPasswordTextViewId());

    }
@@ -132,7 +132,7 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 
            okButton.setOnHoverListener(mLiftToActivateListener);

        }

        if (pinInputFieldStyledFocusState()) {

            collectFlow(mPasswordEntry, mKeyboardRepository.isAnyKeyboardConnected(),

            collectFlow(mPasswordEntry, mKeyguardKeyboardInteractor.isAnyKeyboardConnected(),

                    this::setKeyboardBasedFocusOutline);



            /**

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

+3 −3
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyboard.data.repository.KeyboardRepository;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.policy.DevicePostureController;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
@@ -61,11 +61,11 @@ public class KeyguardPinViewController 
            FalsingCollector falsingCollector,

            DevicePostureController postureController, FeatureFlags featureFlags,

            SelectedUserInteractor selectedUserInteractor, UiEventLogger uiEventLogger,

            KeyboardRepository keyboardRepository) {

            KeyguardKeyboardInteractor keyguardKeyboardInteractor) {

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

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                emergencyButtonController, falsingCollector, featureFlags, selectedUserInteractor,

                keyboardRepository);

                keyguardKeyboardInteractor);

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mPostureController = postureController;

        mLockPatternUtils = lockPatternUtils;

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

+4 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ import android.widget.ImageView; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyboard.data.repository.KeyboardRepository;

import com.android.systemui.res.R;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
@@ -94,11 +94,12 @@ public class KeyguardSimPinViewController 
            LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,

            TelephonyManager telephonyManager, FalsingCollector falsingCollector,

            EmergencyButtonController emergencyButtonController, FeatureFlags featureFlags,

            SelectedUserInteractor selectedUserInteractor, KeyboardRepository keyboardRepository) {

            SelectedUserInteractor selectedUserInteractor,

            KeyguardKeyboardInteractor keyguardKeyboardInteractor) {

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

                messageAreaControllerFactory, latencyTracker, liftToActivateListener,

                emergencyButtonController, falsingCollector, featureFlags, selectedUserInteractor,

                keyboardRepository);

                keyguardKeyboardInteractor);

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mTelephonyManager = telephonyManager;

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