Merge "Remove unused methods" (8aa8ea4d) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import android.graphics.ColorFilter;
		import android.graphics.Insets;
		import android.graphics.Paint;
		import android.graphics.PixelFormat;
		import android.graphics.PointF;
		import android.graphics.Rect;
		import android.graphics.Region;
		import android.graphics.drawable.Drawable;
		@@ -3752,13 +3751,12 @@ public final class NotificationPanelViewController extends PanelViewController {
		*
		* @param dozing {@code true} when dozing.
		* @param animate if transition should be animated.
		* @param wakeUpTouchLocation touch event location - if woken up by SLPI sensor.
		*/
		public void setDozing(boolean dozing, boolean animate, PointF wakeUpTouchLocation) {
		public void setDozing(boolean dozing, boolean animate) {
		if (dozing == mDozing) return;
		mView.setDozing(dozing);
		mDozing = dozing;
		mNotificationStackScrollLayoutController.setDozing(mDozing, animate, wakeUpTouchLocation);
		mNotificationStackScrollLayoutController.setDozing(mDozing, animate);
		mKeyguardBottomArea.setDozing(mDozing, animate);
		mKeyguardBottomAreaInteractorProvider.get().setAnimateDozingTransitions(animate);
		mKeyguardStatusBarViewController.setDozing(mDozing);
		@@ -4683,7 +4681,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		* change.
		*/
		public void showAodUi() {
		setDozing(true /* dozing /, false / animate */, null);
		setDozing(true /* dozing /, false / animate */);
		mStatusBarStateController.setUpcomingState(KEYGUARD);
		mEntryManager.updateNotifications("showAodUi");
		mStatusBarStateListener.onStateChanged(KEYGUARD);

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -302,11 +302,6 @@ public class StatusBarStateControllerImpl implements
		return true;
		}

		@Override
		public void setDozeAmount(float dozeAmount, boolean animated) {
		setAndInstrumentDozeAmount(null, dozeAmount, animated);
		}

		@Override
		public void setAndInstrumentDozeAmount(View view, float dozeAmount, boolean animated) {
		if (mDarkAnimator != null && mDarkAnimator.isRunning()) {

packages/SystemUI/src/com/android/systemui/statusbar/SysuiStatusBarStateController.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -98,14 +98,6 @@ public interface SysuiStatusBarStateController extends StatusBarStateController
		*/
		boolean setIsDozing(boolean isDozing);

		/**
		* Changes the current doze amount.
		*
		* @param dozeAmount New doze/dark amount.
		* @param animated If change should be animated or not. This will cancel current animations.
		*/
		void setDozeAmount(float dozeAmount, boolean animated);

		/**
		* Changes the current doze amount, also starts the
		* {@link com.android.internal.jank.InteractionJankMonitor InteractionJankMonitor} as possible.

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.graphics.Color;
		import android.graphics.Outline;
		import android.graphics.Paint;
		import android.graphics.Path;
		import android.graphics.PointF;
		import android.graphics.Rect;
		import android.os.Bundle;
		import android.provider.Settings;
		@@ -4405,8 +4404,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		* See {@link AmbientState#setDozing}.
		*/
		@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
		public void setDozing(boolean dozing, boolean animate,
		@Nullable PointF touchWakeUpScreenLocation) {
		public void setDozing(boolean dozing, boolean animate) {
		if (mAmbientState.isDozing() == dozing) {
		return;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import static com.android.systemui.statusbar.phone.NotificationIconAreaControlle
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.graphics.Point;
		import android.graphics.PointF;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.provider.Settings;
		@@ -1235,8 +1234,8 @@ public class NotificationStackScrollLayoutController {
		mView.setAnimationsEnabled(enabled);
		}

		public void setDozing(boolean dozing, boolean animate, PointF wakeUpTouchLocation) {
		mView.setDozing(dozing, animate, wakeUpTouchLocation);
		public void setDozing(boolean dozing, boolean animate) {
		mView.setDozing(dozing, animate);
		}

		public void setPulsing(boolean pulsing, boolean animatePulse) {