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

Commit ee460a7a authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Delete ShadeSurface.getNotificationStackScrollLayoutController" into main

parents 60b08814 a39674e3

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

+0 −5
Original line number Diff line number Diff line
@@ -3575,11 +3575,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return mTouchHandler;

    }



    @Override

    public NotificationStackScrollLayoutController getNotificationStackScrollLayoutController() {

        return mNotificationStackScrollLayoutController;

    }



    @Override

    public void disableHeader(int state1, int state2, boolean animated) {

        mShadeHeaderController.disable(state1, state2, animated);

packages/SystemUI/src/com/android/systemui/shade/ShadeSurface.kt

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.systemui.shade 


import android.view.ViewPropertyAnimator

import com.android.systemui.statusbar.GestureRecorder

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.phone.CentralSurfaces

import com.android.systemui.statusbar.policy.HeadsUpManager
@@ -44,9 +43,6 @@ interface ShadeSurface : ShadeViewController { 
    /** Animates the view from its current alpha to zero then runs the runnable. */

    fun fadeOut(startDelayMs: Long, durationMs: Long, endAction: Runnable): ViewPropertyAnimator



    /** Returns the NSSL controller. */

    val notificationStackScrollLayoutController: NotificationStackScrollLayoutController



    /** Set whether the bouncer is showing. */

    fun setBouncerShowing(bouncerShowing: Boolean)

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

+1 −2
Original line number Diff line number Diff line
@@ -2587,8 +2587,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                // So if AOD is off or unsupported we need to trigger these updates at screen on

                // when the keyguard is occluded.

                mLockscreenUserManager.updatePublicMode();

                mShadeSurface.getNotificationStackScrollLayoutController()

                        .updateSensitivenessForOccludedWakeup();

                mStackScrollerController.updateSensitivenessForOccludedWakeup();

            }

            if (mLaunchCameraWhenFinishedWaking) {

                mCameraLauncherLazy.get().launchCamera(mLastCameraLaunchSource,