Merge "[Central Surfaces] Remove unused methods & variables from interface." into udc-qpr-dev (1aaaa88d) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.RemoteAnimationAdapter;
		import android.view.View;
		import android.view.ViewGroup;
		import android.window.RemoteTransition;
		import android.window.SplashScreen;

		@@ -40,7 +39,6 @@ import androidx.lifecycle.Lifecycle;
		import androidx.lifecycle.LifecycleOwner;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.statusbar.RegisterStatusBarResult;
		import com.android.keyguard.AuthKeyguardMessageArea;
		import com.android.systemui.Dumpable;
		import com.android.systemui.animation.ActivityLaunchAnimator;
		@@ -52,7 +50,6 @@ import com.android.systemui.shade.NotificationShadeWindowView;
		import com.android.systemui.shade.NotificationShadeWindowViewController;
		import com.android.systemui.shade.ShadeViewController;
		import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
		import com.android.systemui.statusbar.LightRevealScrim;
		import com.android.systemui.statusbar.NotificationPresenter;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.util.Compile;
		@@ -70,14 +67,11 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {
		String TAG = "CentralSurfaces";
		boolean DEBUG = false;
		boolean SPEW = false;
		boolean DUMPTRUCK = true; // extra dumpsys info
		boolean DEBUG_GESTURES = false;
		boolean DEBUG_MEDIA_FAKE_ARTWORK = false;
		boolean DEBUG_CAMERA_LIFT = false;
		boolean DEBUG_WINDOW_STATE = false;
		boolean DEBUG_WAKEUP_DELAY = Compile.IS_DEBUG;
		// additional instrumentation for testing purposes; intended to be left on during development
		boolean CHATTY = DEBUG;
		boolean SHOW_LOCKSCREEN_MEDIA_ARTWORK = true;
		String ACTION_FAKE_ARTWORK = "fake_artwork";
		int FADE_KEYGUARD_START_DELAY = 100;
		@@ -240,8 +234,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {

		void onKeyguardViewManagerStatesUpdated();

		ViewGroup getNotificationScrollLayout();

		boolean isPulsing();

		boolean isOccluded();
		@@ -303,8 +295,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {
		@Override
		void dump(PrintWriter pwOriginal, String[] args);

		void createAndAddWindows(@Nullable RegisterStatusBarResult result);

		float getDisplayWidth();

		float getDisplayHeight();
		@@ -354,8 +344,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {
		void showBouncerWithDimissAndCancelIfKeyguard(OnDismissAction performAction,
		Runnable cancelAction);

		LightRevealScrim getLightRevealScrim();

		// TODO: Figure out way to remove these.
		NavigationBarView getNavigationBarView();

		@@ -469,8 +457,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {

		void extendDozePulse();

		boolean shouldDelayWakeUpAnimation();

		public static class KeyboardShortcutsMessage {
		final int mDeviceId;

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

+1 −12

Original line number	Diff line number	Diff line
		@@ -1824,11 +1824,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		logStateToEventlog();
		}

		@Override
		public ViewGroup getNotificationScrollLayout() {
		return mStackScroller;
		}

		@Override
		public boolean isPulsing() {
		return mDozeServiceHost.isPulsing();
		@@ -2253,8 +2248,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		+ CameraIntents.getOverrideCameraPackage(mContext));
		}

		@Override
		public void createAndAddWindows(@Nullable RegisterStatusBarResult result) {
		private void createAndAddWindows(@Nullable RegisterStatusBarResult result) {
		makeStatusBarView(result);
		mNotificationShadeWindowController.attach();
		mStatusBarWindowController.attach();
		@@ -3035,11 +3029,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		}
		}

		@Override
		public LightRevealScrim getLightRevealScrim() {
		return mLightRevealScrim;
		}

		// TODO: Figure out way to remove these.
		@Override
		public NavigationBarView getNavigationBarView() {