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

Commit e1f2ea3d authored by Justin Weir's avatar Justin Weir
Browse files

Remove references to PanelViewController

Replaced by references to NPVC

Bug: 242211739
Test: atest SystemUITests SystemUIGoogleTests
Change-Id: I87828825a7e1c8d189f8f940c2599e3d021e6c9a
parent 5020f0fc
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ import com.android.keyguard.KeyguardUpdateMonitor
import com.android.systemui.ActivityIntentHelper
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.shade.NotificationPanelViewController
import com.android.systemui.shared.system.ActivityManagerKt.isInForeground
import com.android.systemui.statusbar.StatusBarState
import com.android.systemui.statusbar.phone.CentralSurfaces
import com.android.systemui.shade.PanelViewController
import com.android.systemui.statusbar.policy.KeyguardStateController
import java.util.concurrent.Executor
import javax.inject.Inject
@@ -117,7 +117,7 @@ class CameraGestureHelper @Inject constructor(
                    )
                } catch (e: RemoteException) {
                    Log.w(
                        PanelViewController.TAG,
                        NotificationPanelViewController.TAG,
                        "Unable to start camera activity",
                        e
                    )
+6 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.R;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler;
import com.android.systemui.dreams.touch.DreamTouchHandler;
import com.android.systemui.shade.PanelViewController;
import com.android.systemui.shade.NotificationPanelViewController;
import com.android.wm.shell.animation.FlingAnimationUtils;

import javax.inject.Named;
@@ -77,8 +77,9 @@ public class BouncerSwipeModule {
            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
        return flingAnimationUtilsBuilderProvider.get()
                .reset()
                .setMaxLengthSeconds(PanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)
                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
                .setMaxLengthSeconds(
                        NotificationPanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)
                .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)
                .build();
    }

@@ -91,8 +92,8 @@ public class BouncerSwipeModule {
            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
        return flingAnimationUtilsBuilderProvider.get()
                .reset()
                .setMaxLengthSeconds(PanelViewController.FLING_MAX_LENGTH_SECONDS)
                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
                .setMaxLengthSeconds(NotificationPanelViewController.FLING_MAX_LENGTH_SECONDS)
                .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)
                .build();
    }

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.phone.KeyguardBottomAreaView;
public abstract class PanelView extends FrameLayout {
    public static final boolean DEBUG = false;
    public static final String TAG = PanelView.class.getSimpleName();
    private PanelViewController.TouchHandler mTouchHandler;
    private NotificationPanelViewController.TouchHandler mTouchHandler;

    protected CentralSurfaces mCentralSurfaces;
    protected HeadsUpManagerPhone mHeadsUpManager;
@@ -49,7 +49,7 @@ public abstract class PanelView extends FrameLayout {
        super(context, attrs, defStyleAttr);
    }

    public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) {
    public void setOnTouchListener(NotificationPanelViewController.TouchHandler touchHandler) {
        super.setOnTouchListener(touchHandler);
        mTouchHandler = touchHandler;
    }
+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ import com.android.wm.shell.animation.FlingAnimationUtils;
import java.io.PrintWriter;
import java.util.List;

public abstract class PanelViewController {
abstract class PanelViewController {
    public static final String TAG = PanelView.class.getSimpleName();
    public static final float FLING_MAX_LENGTH_SECONDS = 0.6f;
    public static final float FLING_SPEED_UP_FACTOR = 0.6f;
+4 −4
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
    private DisplayMetrics mDisplayMetrics = new DisplayMetrics();
    @Mock
    private KeyguardClockSwitch mKeyguardClockSwitch;
    private PanelViewController.TouchHandler mTouchHandler;
    private NotificationPanelViewController.TouchHandler mTouchHandler;
    private ConfigurationController mConfigurationController;
    @Mock
    private MediaHierarchyManager mMediaHiearchyManager;
@@ -454,7 +454,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
        doAnswer((Answer<Void>) invocation -> {
            mTouchHandler = invocation.getArgument(0);
            return null;
        }).when(mView).setOnTouchListener(any(PanelViewController.TouchHandler.class));
        }).when(mView).setOnTouchListener(any(NotificationPanelViewController.TouchHandler.class));

        NotificationWakeUpCoordinator coordinator =
                new NotificationWakeUpCoordinator(
@@ -1407,7 +1407,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
        when(mQsFrame.getWidth()).thenReturn(1000);
        when(mQsHeader.getTop()).thenReturn(0);
        when(mQsHeader.getBottom()).thenReturn(1000);
        PanelViewController.TouchHandler touchHandler =
        NotificationPanelViewController.TouchHandler touchHandler =
                mNotificationPanelViewController.createTouchHandler();

        mNotificationPanelViewController.setExpandedFraction(1f);
@@ -1427,7 +1427,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
        when(mQsFrame.getWidth()).thenReturn(1000);
        when(mQsHeader.getTop()).thenReturn(0);
        when(mQsHeader.getBottom()).thenReturn(1000);
        PanelViewController.TouchHandler touchHandler =
        NotificationPanelViewController.TouchHandler touchHandler =
                mNotificationPanelViewController.createTouchHandler();

        mNotificationPanelViewController.setExpandedFraction(1f);
Loading