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

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

Delete some dead code 

Bug: 249277686
Flag: NONE
Test: presubmits are sufficient
Change-Id: I0835cf3d6202d01dc07436b4c806a1311f4695ba
parent 08d21955

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

+1 −9
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.Trace;

import android.os.UserManager;

import android.os.VibrationEffect;

import android.provider.Settings;

import android.util.IndentingPrintWriter;

import android.util.Log;
@@ -256,12 +255,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private static final boolean DEBUG_LOGCAT = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean SPEW_LOGCAT = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.VERBOSE);

    private static final boolean DEBUG_DRAWABLE = false;

    private static final VibrationEffect ADDITIONAL_TAP_REQUIRED_VIBRATION_EFFECT =

            VibrationEffect.get(VibrationEffect.EFFECT_STRENGTH_MEDIUM, false);

    /** The parallax amount of the quick settings translation when dragging down the panel. */

    public static final float QS_PARALLAX_AMOUNT = 0.175f;

    /** The delay to reset the hint text when the hint animation is finished running. */

    private static final int HINT_RESET_DELAY_MS = 1200;

    private static final long ANIMATION_DELAY_ICON_FADE_IN =

            ActivityLaunchAnimator.TIMINGS.getTotalDuration()

                    - CollapsedStatusBarFragment.FADE_IN_DURATION
@@ -621,7 +616,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private int mDreamingToLockscreenTransitionTranslationY;

    private int mLockscreenToDreamingTransitionTranslationY;

    private int mGoneToDreamingTransitionTranslationY;

    private SplitShadeStateController mSplitShadeStateController;

    private final SplitShadeStateController mSplitShadeStateController;

    private final Runnable mFlingCollapseRunnable = () -> fling(0, false /* expand */,

            mNextCollapseSpeedUpFactor, false /* expandBecauseOfFalsing */);

    private final Runnable mAnimateKeyguardBottomAreaInvisibleEndRunnable =
@@ -636,9 +631,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        }

    };



    private final Consumer<Boolean> mMultiShadeExpansionConsumer =

            (Boolean expanded) -> mIsAnyMultiShadeExpanded = expanded;



    private final Consumer<TransitionStep> mDreamingToLockscreenTransition =

            (TransitionStep step) -> {

                mIsOcclusionTransitionRunning =

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+3 −28
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ import static androidx.lifecycle.Lifecycle.State.RESUMED; 


import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;

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

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

import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;

import static com.android.systemui.statusbar.NotificationLockscreenUserManager.PERMISSION_SELF;

import static com.android.systemui.statusbar.StatusBarState.SHADE;

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



import android.annotation.Nullable;

import android.app.ActivityOptions;
@@ -95,7 +95,6 @@ import androidx.lifecycle.LifecycleRegistry; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.colorextraction.ColorExtractor;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;
@@ -202,12 +201,10 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; 
import com.android.systemui.statusbar.core.StatusBarInitializer;

import com.android.systemui.statusbar.data.model.StatusBarMode;

import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationActivityStarter;

import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor;
@@ -225,7 +222,6 @@ import com.android.systemui.statusbar.policy.ExtensionController; 
import com.android.systemui.statusbar.policy.HeadsUpManager;

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

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

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.surfaceeffects.ripple.RippleShader.RippleShape;
@@ -278,19 +274,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private static final String BANNER_ACTION_SETUP =

            "com.android.systemui.statusbar.banner_action_setup";



    private static final int MSG_OPEN_SETTINGS_PANEL = 1002;

    private static final int MSG_LAUNCH_TRANSITION_TIMEOUT = 1003;

    // 1020-1040 reserved for BaseStatusBar



    /**

     * TODO(b/249277686) delete this

     * The delay to reset the hint text when the hint animation is finished running.

     */

    private static final int HINT_RESET_DELAY_MS = 1200;



    /** If true, the lockscreen will show a distinct wallpaper */

    public static final boolean ENABLE_LOCKSCREEN_WALLPAPER = true;



    private static final UiEventLogger sUiEventLogger = new UiEventLoggerImpl();



    private final Context mContext;
@@ -300,7 +286,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks;

    private float mTransitionToFullShadeProgress = 0f;

    private final NotificationListContainer mNotifListContainer;

    private boolean mIsShortcutListSearchEnabled;

    private final boolean mIsShortcutListSearchEnabled;



    private final KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {
@@ -459,7 +445,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private final NotificationGutsManager mGutsManager;

    private final ShadeExpansionStateManager mShadeExpansionStateManager;

    private final KeyguardViewMediator mKeyguardViewMediator;

    private final VisualInterruptionDecisionProvider mVisualInterruptionDecisionProvider;

    private final BrightnessSliderController.Factory mBrightnessSliderFactory;

    private final FeatureFlags mFeatureFlags;

    private final FragmentService mFragmentService;
@@ -555,7 +540,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private int mLastLoggedStateFingerprint;

    private boolean mIsLaunchingActivityOverLockscreen;



    private final UserSwitcherController mUserSwitcherController;

    private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);

    protected final BatteryController mBatteryController;

    private UiModeManager mUiModeManager;
@@ -586,8 +570,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private final ColorExtractor.OnColorsChangedListener mOnColorsChangedListener =

            (extractor, which) -> updateTheme();



    private final InteractionJankMonitor mJankMonitor;



    private final SceneContainerFlags mSceneContainerFlags;



    /**
@@ -615,12 +597,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            KeyguardBypassController keyguardBypassController,

            KeyguardStateController keyguardStateController,

            HeadsUpManager headsUpManager,

            DynamicPrivacyController dynamicPrivacyController,

            FalsingManager falsingManager,

            FalsingCollector falsingCollector,

            BroadcastDispatcher broadcastDispatcher,

            NotificationGutsManager notificationGutsManager,

            VisualInterruptionDecisionProvider visualInterruptionDecisionProvider,

            ShadeExpansionStateManager shadeExpansionStateManager,

            KeyguardViewMediator keyguardViewMediator,

            DisplayMetrics displayMetrics,
@@ -633,7 +613,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            NotificationLockscreenUserManager lockScreenUserManager,

            NotificationRemoteInputManager remoteInputManager,

            QuickSettingsController quickSettingsController,

            UserSwitcherController userSwitcherController,

            BatteryController batteryController,

            SysuiColorExtractor colorExtractor,

            ScreenLifecycle screenLifecycle,
@@ -693,7 +672,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            WallpaperManager wallpaperManager,

            Optional<StartingSurface> startingSurfaceOptional,

            ActivityLaunchAnimator activityLaunchAnimator,

            InteractionJankMonitor jankMonitor,

            DeviceStateManager deviceStateManager,

            WiredChargingRippleController wiredChargingRippleController,

            IDreamManager dreamManager,
@@ -727,7 +705,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mFalsingManager = falsingManager;

        mBroadcastDispatcher = broadcastDispatcher;

        mGutsManager = notificationGutsManager;

        mVisualInterruptionDecisionProvider = visualInterruptionDecisionProvider;

        mShadeExpansionStateManager = shadeExpansionStateManager;

        mKeyguardViewMediator = keyguardViewMediator;

        mDisplayMetrics = displayMetrics;
@@ -740,7 +717,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mLockscreenUserManager = lockScreenUserManager;

        mRemoteInputManager = remoteInputManager;

        mQsController = quickSettingsController;

        mUserSwitcherController = userSwitcherController;

        mBatteryController = batteryController;

        mColorExtractor = colorExtractor;

        mScreenLifecycle = screenLifecycle;
@@ -795,7 +771,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mMainExecutor = delayableExecutor;

        mMessageRouter = messageRouter;

        mWallpaperManager = wallpaperManager;

        mJankMonitor = jankMonitor;

        mCameraLauncherLazy = cameraLauncherLazy;

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        mUserTracker = userTracker;
@@ -3087,7 +3062,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        }

    };



    private StatusBarStateController.StateListener mStateListener =

    private final StatusBarStateController.StateListener mStateListener =

            new StatusBarStateController.StateListener() {

                @Override

                public void onStatePreChange(int oldState, int newState) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+0 −17
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import android.view.WindowManager; 
import androidx.test.filters.SmallTest;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.testing.FakeMetricsLogger;
@@ -131,7 +130,6 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.statusbar.LightRevealScrim;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationPresenter;
@@ -144,13 +142,10 @@ import com.android.systemui.statusbar.StatusBarState; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.core.StatusBarInitializer;

import com.android.systemui.statusbar.data.repository.FakeStatusBarModeRepository;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.NotificationActivityStarter;

import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptLogger;
@@ -169,7 +164,6 @@ import com.android.systemui.statusbar.policy.ExtensionController; 
import com.android.systemui.statusbar.policy.HeadsUpManager;

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

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

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.util.EventLog;
@@ -235,12 +229,10 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    @Mock private Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;

    @Mock private BiometricUnlockController mBiometricUnlockController;

    @Mock private AuthRippleController mAuthRippleController;

    @Mock private NotificationListener mNotificationListener;

    @Mock private KeyguardViewMediator mKeyguardViewMediator;

    @Mock private NotificationLockscreenUserManager mLockscreenUserManager;

    @Mock private NotificationRemoteInputManager mRemoteInputManager;

    @Mock private StatusBarStateControllerImpl mStatusBarStateController;

    @Mock private ShadeExpansionStateManager mShadeExpansionStateManager;

    @Mock private BatteryController mBatteryController;

    @Mock private DeviceProvisionedController mDeviceProvisionedController;

    @Mock private NotificationLaunchAnimatorControllerProvider mNotifLaunchAnimControllerProvider;
@@ -262,12 +254,10 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    @Mock private PulseExpansionHandler mPulseExpansionHandler;

    @Mock private NotificationWakeUpCoordinator mNotificationWakeUpCoordinator;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private DynamicPrivacyController mDynamicPrivacyController;

    @Mock private AutoHideController mAutoHideController;

    @Mock private StatusBarWindowController mStatusBarWindowController;

    @Mock private Provider<CollapsedStatusBarFragment> mCollapsedStatusBarFragmentProvider;

    @Mock private StatusBarWindowStateController mStatusBarWindowStateController;

    @Mock private UserSwitcherController mUserSwitcherController;

    @Mock private Bubbles mBubbles;

    @Mock private NoteTaskController mNoteTaskController;

    @Mock private NotificationShadeWindowController mNotificationShadeWindowController;
@@ -295,7 +285,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    @Mock private WallpaperController mWallpaperController;

    @Mock private StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager;

    @Mock private LockscreenShadeTransitionController mLockscreenTransitionController;

    @Mock private NotificationVisibilityProvider mVisibilityProvider;

    @Mock private WallpaperManager mWallpaperManager;

    @Mock private IWallpaperManager mIWallpaperManager;

    @Mock private KeyguardUnlockAnimationController mKeyguardUnlockAnimationController;
@@ -304,8 +293,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    @Mock private OperatorNameViewController mOperatorNameViewController;

    @Mock private OperatorNameViewController.Factory mOperatorNameViewControllerFactory;

    @Mock private ActivityLaunchAnimator mActivityLaunchAnimator;

    @Mock private NotifLiveDataStore mNotifLiveDataStore;

    @Mock private InteractionJankMonitor mJankMonitor;

    @Mock private DeviceStateManager mDeviceStateManager;

    @Mock private WiredChargingRippleController mWiredChargingRippleController;

    @Mock private Lazy<CameraLauncher> mCameraLauncherLazy;
@@ -465,12 +452,10 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                mKeyguardBypassController,

                mKeyguardStateController,

                mHeadsUpManager,

                mDynamicPrivacyController,

                new FalsingManagerFake(),

                new FalsingCollectorFake(),

                mBroadcastDispatcher,

                mNotificationGutsManager,

                mVisualInterruptionDecisionProvider,

                new ShadeExpansionStateManager(),

                mKeyguardViewMediator,

                new DisplayMetrics(),
@@ -483,7 +468,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                mLockscreenUserManager,

                mRemoteInputManager,

                mQuickSettingsController,

                mUserSwitcherController,

                mBatteryController,

                mColorExtractor,

                mScreenLifecycle,
@@ -542,7 +526,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                mWallpaperManager,

                Optional.of(mStartingSurface),

                mActivityLaunchAnimator,

                mJankMonitor,

                mDeviceStateManager,

                mWiredChargingRippleController,

                mDreamManager,