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

Commit 3738c312 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge changes from topics "284332422", "b284332422" into udc-qpr-dev am: dd87b7b5 am: d04681ff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23476818



Change-Id: I75bc285069115bbd47df91ff50428aa02920652b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 692a3c22 d04681ff

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

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import com.android.systemui.navigationbar.NavigationBarView; 
import com.android.systemui.plugins.ActivityStarter.OnDismissAction;

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.shade.NotificationShadeWindowViewController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;

import com.android.systemui.statusbar.NotificationPresenter;
@@ -211,8 +210,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
     */

    void wakeUpIfDozing(long time, String why, @PowerManager.WakeReason int wakeReason);



    NotificationShadeWindowViewController getNotificationShadeWindowViewController();



    /** */

    ShadeViewController getShadeViewController();

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

+0 −5
Original line number Diff line number Diff line
@@ -1743,11 +1743,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        Trace.endSection();

    }



    @Override

    public NotificationShadeWindowViewController getNotificationShadeWindowViewController() {

        return mNotificationShadeWindowViewController;

    }



    @Override

    public ShadeViewController getShadeViewController() {

        return mShadeSurface;