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

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

Remove clock migration: bonus one 

Just a couple unused references

Bug: 301502635
Test: atest SystemUITests
Flag: EXEMPT flag cleanup
Change-Id: Ib1e6ebd4d9f1f79d5e6fdf850cd0853a116cd6ec
parent 7dbe23da

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+0 −22
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import com.android.systemui.fragments.FragmentHostManager; 
import com.android.systemui.fragments.FragmentService;

import com.android.systemui.haptics.msdl.FakeMSDLPlayer;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.KeyguardViewConfigurator;

import com.android.systemui.keyguard.data.repository.FakeKeyguardClockRepository;

import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository;

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor;
@@ -89,7 +88,6 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; 
import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.domain.interactor.NaturalScrollingSettingObserver;

import com.android.systemui.keyguard.ui.view.KeyguardRootView;

import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel;

import com.android.systemui.keyguard.ui.viewmodel.KeyguardTouchHandlingViewModel;

import com.android.systemui.kosmos.KosmosJavaAdapter;
@@ -240,9 +238,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Mock protected AmbientState mAmbientState;

    @Mock protected UserManager mUserManager;

    @Mock protected UiEventLogger mUiEventLogger;

    @Mock protected KeyguardViewConfigurator mKeyguardViewConfigurator;

    @Mock protected KeyguardRootView mKeyguardRootView;

    @Mock protected View mKeyguardRootViewChild;

    @Mock protected KeyguardMediaController mKeyguardMediaController;

    @Mock protected NavigationModeController mNavigationModeController;

    @Mock protected NavigationBarController mNavigationBarController;
@@ -534,9 +529,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
        when(longPressHandlingView.getResources()).thenReturn(longPressHandlingViewRes);

        when(longPressHandlingViewRes.getString(anyInt())).thenReturn("");



        when(mKeyguardRootView.findViewById(anyInt())).thenReturn(mKeyguardRootViewChild);

        when(mKeyguardViewConfigurator.getKeyguardRootView()).thenReturn(mKeyguardRootView);



        mNotificationPanelViewController = new NotificationPanelViewController(

                mView,

                mMainHandler,
@@ -598,7 +590,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mSharedNotificationContainerInteractor,

                mActiveNotificationsInteractor,

                mShadeAnimationInteractor,

                mKeyguardViewConfigurator,

                mDeviceEntryFaceAuthInteractor,

                new ResourcesSplitShadeStateController(),

                mPowerInteractor,
@@ -699,19 +690,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
        }

    }



    protected void setBottomPadding(int stackBottom, int lockIconPadding, int indicationPadding,

            int ambientPadding) {



        when(mNotificationStackScrollLayoutController.getTop()).thenReturn(0);

        when(mNotificationStackScrollLayoutController.getHeight()).thenReturn(stackBottom);

        when(mNotificationStackScrollLayoutController.getBottom()).thenReturn(stackBottom);

        when(mKeyguardRootViewChild.getTop()).thenReturn((int) (stackBottom - lockIconPadding));



        when(mResources.getDimensionPixelSize(R.dimen.keyguard_indication_bottom_padding))

                .thenReturn(indicationPadding);

        mNotificationPanelViewController.loadDimens();

    }



    protected void triggerPositionClockAndNotifications() {

        mNotificationPanelViewController.onQsSetExpansionHeightCalled(false);

    }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+0 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor

import com.android.systemui.keyguard.shared.model.LockscreenSceneBlueprint

import com.android.systemui.keyguard.ui.binder.KeyguardBlueprintViewBinder

import com.android.systemui.keyguard.ui.binder.KeyguardRootViewBinder

import com.android.systemui.keyguard.ui.binder.LightRevealScrimViewBinder
@@ -38,7 +37,6 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel 
import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel

import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.scene.shared.flag.SceneContainerFlag
@@ -47,13 +45,11 @@ import com.android.systemui.shade.domain.interactor.ShadeInteractor 
import com.android.systemui.statusbar.KeyguardIndicationController

import com.android.systemui.statusbar.LightRevealScrim

import com.android.systemui.statusbar.VibratorHelper

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationLockscreenScrimViewModel

import com.android.systemui.statusbar.phone.ScreenOffAnimationController

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import com.android.systemui.wallpapers.ui.viewmodel.WallpaperViewModel

import com.google.android.msdl.domain.MSDLPlayer

import dagger.Lazy

import java.util.Optional

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher
@@ -82,9 +78,6 @@ constructor( 
    private val falsingManager: FalsingManager,

    private val keyguardClockViewModel: KeyguardClockViewModel,

    private val smartspaceViewModel: KeyguardSmartspaceViewModel,

    private val lockscreenContentViewModelFactory: LockscreenContentViewModel.Factory,

    private val notificationScrimViewModelFactory: NotificationLockscreenScrimViewModel.Factory,

    private val lockscreenSceneBlueprintsLazy: Lazy<Set<LockscreenSceneBlueprint>>,

    private val clockInteractor: KeyguardClockInteractor,

    private val keyguardViewMediator: KeyguardViewMediator,

    private val deviceEntryUnlockTrackerViewBinder: Optional<DeviceEntryUnlockTrackerViewBinder>,
@@ -97,7 +90,6 @@ constructor( 
) : CoreStartable {



    private var rootViewHandle: DisposableHandle? = null

    private var indicationAreaHandle: DisposableHandle? = null



    override fun start() {

        bindKeyguardRootView()

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −4
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ import com.android.systemui.flags.FeatureFlags; 
import com.android.systemui.flags.Flags;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.KeyguardViewConfigurator;

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;
@@ -531,7 +530,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    private final KeyguardInteractor mKeyguardInteractor;

    private final PowerInteractor mPowerInteractor;

    private final KeyguardViewConfigurator mKeyguardViewConfigurator;

    private final CoroutineDispatcher mMainDispatcher;

    private boolean mIsAnyMultiShadeExpanded;

    private boolean mForceFlingAnimationForTest = false;
@@ -624,7 +622,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            SharedNotificationContainerInteractor sharedNotificationContainerInteractor,

            ActiveNotificationsInteractor activeNotificationsInteractor,

            ShadeAnimationInteractor shadeAnimationInteractor,

            KeyguardViewConfigurator keyguardViewConfigurator,

            DeviceEntryFaceAuthInteractor deviceEntryFaceAuthInteractor,

            SplitShadeStateController splitShadeStateController,

            PowerInteractor powerInteractor,
@@ -654,7 +651,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mActiveNotificationsInteractor = activeNotificationsInteractor;

        mKeyguardInteractor = keyguardInteractor;

        mPowerInteractor = powerInteractor;

        mKeyguardViewConfigurator = keyguardViewConfigurator;

        mClockPositionAlgorithm = keyguardClockPositionAlgorithm;

        mNaturalScrollingSettingObserver = naturalScrollingSettingObserver;

        mView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {