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

Commit f6a30104 authored by Sherry Zhou's avatar Sherry Zhou Committed by Android (Google) Code Review
Browse files

Merge "Remove unused wallpaperFocalAreaViewModel in NotificationPanelViewController" into main

parents 68798459 c1747bf6

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

+0 −3
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ import com.android.systemui.util.kotlin.JavaAdapter; 
import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;

import com.android.systemui.wallpapers.ui.viewmodel.WallpaperFocalAreaViewModel;

import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor;

import com.android.wm.shell.animation.FlingAnimationUtils;
@@ -262,7 +261,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
            mDreamingToLockscreenTransitionViewModel;

    @Mock protected KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    @Mock protected KeyguardTouchHandlingViewModel.Factory mKeyguardTouchHandlingViewModelFactory;

    @Mock protected WallpaperFocalAreaViewModel mWallpaperFocalAreaViewModel;

    @Mock protected AlternateBouncerInteractor mAlternateBouncerInteractor;

    @Mock protected MotionEvent mDownMotionEvent;

    @Mock protected CoroutineDispatcher mMainDispatcher;
@@ -570,7 +568,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mKeyguardTransitionInteractor,

                mDumpManager,

                mKeyguardTouchHandlingViewModelFactory,

                mWallpaperFocalAreaViewModel,

                mKeyguardInteractor,

                mActivityStarter,

                mSharedNotificationContainerInteractor,

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

+0 −4
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ import com.android.systemui.statusbar.policy.SplitShadeStateController; 
import com.android.systemui.unfold.SysUIUnfoldComponent;

import com.android.systemui.util.Utils;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.wallpapers.ui.viewmodel.WallpaperFocalAreaViewModel;

import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor;

import com.android.wm.shell.animation.FlingAnimationUtils;
@@ -503,7 +502,6 @@ public final class NotificationPanelViewController implements 
    private final NotificationListContainer mNotificationListContainer;

    private final NPVCDownEventState.Buffer mLastDownEvents;

    private final KeyguardClockInteractor mKeyguardClockInteractor;

    private final WallpaperFocalAreaViewModel mWallpaperFocalAreaViewModel;

    private float mMinExpandHeight;

    private boolean mPanelUpdateWhenAnimatorEnds;

    private boolean mHasVibratedOnOpen = false;
@@ -637,7 +635,6 @@ public final class NotificationPanelViewController implements 
            KeyguardTransitionInteractor keyguardTransitionInteractor,

            DumpManager dumpManager,

            KeyguardTouchHandlingViewModel.Factory keyguardTouchHandlingViewModelFactory,

            WallpaperFocalAreaViewModel wallpaperFocalAreaViewModel,

            KeyguardInteractor keyguardInteractor,

            ActivityStarter activityStarter,

            SharedNotificationContainerInteractor sharedNotificationContainerInteractor,
@@ -800,7 +797,6 @@ public final class NotificationPanelViewController implements 
                SysUIUnfoldComponent::getKeyguardUnfoldTransition);



        mKeyguardClockInteractor = keyguardClockInteractor;

        mWallpaperFocalAreaViewModel = wallpaperFocalAreaViewModel;

        KeyguardTouchViewBinder.bind(

                mView.requireViewById(R.id.keyguard_long_press),

                keyguardTouchHandlingViewModelFactory,