Merge "Delete dead code" into main (c366a6c4) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -531,9 +531,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {

		mNotificationPanelViewController = new NotificationPanelViewController(
		mView,
		mMainHandler,
		mLayoutInflater,
		mFeatureFlags,
		coordinator, expansionHandler, mDynamicPrivacyController, mKeyguardBypassController,
		mFalsingManager, new FalsingCollectorFake(),
		mKeyguardStateController,
		@@ -553,7 +550,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mKeyguardStatusBarViewComponentFactory,
		mLockscreenShadeTransitionController,
		mScrimController,
		mUserManager,
		mMediaDataManager,
		mNotificationShadeDepthController,
		mAmbientState,
		@@ -564,7 +560,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mQsController,
		mFragmentService,
		mStatusBarService,
		mContentResolver,
		mShadeHeaderController,
		mScreenOffAnimationController,
		mLockscreenGestureLogger,
		@@ -575,7 +570,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mKeyguardUnlockAnimationController,
		mKeyguardIndicationController,
		mNotificationListContainer,
		mNotificationStackSizeCalculator,
		mUnlockedScreenOffAnimationController,
		systemClock,
		mKeyguardClockInteractor,
		@@ -594,7 +588,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		new ResourcesSplitShadeStateController(),
		mPowerInteractor,
		mKeyguardClockPositionAlgorithm,
		mNaturalScrollingSettingObserver,
		mMSDLPlayer,
		mBrightnessMirrorShowingInteractor);
		mNotificationPanelViewController.initDependencies(

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

+49 −170

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −19

Original line number	Diff line number	Diff line
		@@ -114,9 +114,7 @@ import java.io.PrintWriter;
		import javax.inject.Inject;
		import javax.inject.Provider;

		/** Handles QuickSettings touch handling, expansion and animation state
		* TODO (b/264460656) make this dumpable
		*/
		/** Handles QuickSettings touch handling, expansion and animation state. */
		@SysUISingleton
		public class QuickSettingsControllerImpl implements QuickSettingsController, Dumpable {
		public static final String TAG = "QuickSettingsController";
		@@ -294,7 +292,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		private ValueAnimator mSizeChangeAnimator;

		private ExpansionHeightListener mExpansionHeightListener;
		private QsStateUpdateListener mQsStateUpdateListener;
		private ApplyClippingImmediatelyListener mApplyClippingImmediatelyListener;
		private FlingQsWithoutClickListener mFlingQsWithoutClickListener;
		private ExpansionHeightSetToMaxListener mExpansionHeightSetToMaxListener;
		@@ -401,10 +398,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		mExpansionHeightListener = listener;
		}

		void setQsStateUpdateListener(QsStateUpdateListener listener) {
		mQsStateUpdateListener = listener;
		}

		void setApplyClippingImmediatelyListener(ApplyClippingImmediatelyListener listener) {
		mApplyClippingImmediatelyListener = listener;
		}
		@@ -562,7 +555,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		}
		// TODO (b/265193930): remove dependency on NPVC
		// Let's reject anything at the very bottom around the home handle in gesture nav
		if (mPanelViewControllerLazy.get().isInGestureNavHomeHandleArea(x, y)) {
		if (mPanelViewControllerLazy.get().isInGestureNavHomeHandleArea(y)) {
		return false;
		}
		return y <= mNotificationStackScrollLayoutController.getBottomMostNotificationBottom()
		@@ -804,7 +797,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		if (changed) {
		mShadeRepository.setLegacyIsQsExpanded(expanded);
		updateQsState();
		mPanelViewControllerLazy.get().onQsExpansionChanged(expanded);
		mPanelViewControllerLazy.get().onQsExpansionChanged();
		mShadeLog.logQsExpansionChanged("QS Expansion Changed.", expanded,
		getMinExpansionHeight(), getMaxExpansionHeight(),
		mStackScrollerOverscrolling, mAnimatorExpand, mAnimating);
		@@ -1021,10 +1014,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		}

		void updateQsState() {
		if (mQsStateUpdateListener != null) {
		mQsStateUpdateListener.onQsStateUpdated(getExpanded(), mStackScrollerOverscrolling);
		}

		if (mQs == null) return;
		mQs.setExpanded(getExpanded());
		}
		@@ -1203,7 +1192,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		/**
		* Applies clipping to quick settings, notifications layout and
		* updates bounds of the notifications background (notifications scrim).
		*
		* <p>
		* The parameters are bounds of the notifications area rectangle, this function
		* calculates bounds for the QS clipping based on the notifications bounds.
		*/
		@@ -2395,10 +2384,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		void onQsSetExpansionHeightCalled(boolean qsFullyExpanded);
		}

		interface QsStateUpdateListener {
		void onQsStateUpdated(boolean qsExpanded, boolean isStackScrollerOverscrolling);
		}

		interface ApplyClippingImmediatelyListener {
		void onQsClippingImmediatelyApplied(boolean clipStatusView, Rect lastQsClipBounds,
		int top, boolean qsFragmentCreated, boolean qsVisible);