Merge "Add logs to ensure that QS / NPVC clip bounds match" (32a2d537) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,13 +29,17 @@ import android.view.WindowInsets;
	import android.widget.FrameLayout;		import android.widget.FrameLayout;
	import android.widget.ImageView;		import android.widget.ImageView;

			import com.android.systemui.Dumpable;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.qs.customize.QSCustomizer;		import com.android.systemui.qs.customize.QSCustomizer;

			import java.io.FileDescriptor;
			import java.io.PrintWriter;

	/**		/**
	* Wrapper view with background which contains {@link QSPanel} and {@link QuickStatusBarHeader}		* Wrapper view with background which contains {@link QSPanel} and {@link QuickStatusBarHeader}
	*/		*/
	public class QSContainerImpl extends FrameLayout {		public class QSContainerImpl extends FrameLayout implements Dumpable {

	private final Point mSizePoint = new Point();		private final Point mSizePoint = new Point();
	private int mFancyClippingTop;		private int mFancyClippingTop;
	@@ -302,4 +306,11 @@ public class QSContainerImpl extends FrameLayout {
	mFancyClippingBottom, mFancyClippingRadii, Path.Direction.CW);		mFancyClippingBottom, mFancyClippingRadii, Path.Direction.CW);
	invalidate();		invalidate();
	}		}

			@Override
			public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
			pw.println(getClass().getSimpleName() + " updateClippingPath: top("
			+ mFancyClippingTop + ") bottom(" + mFancyClippingBottom + ") mClippingEnabled("
			+ mClippingEnabled + ")");
			}
	}		}

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -37,8 +37,10 @@ import android.widget.ImageView;
	import androidx.annotation.Nullable;		import androidx.annotation.Nullable;
	import androidx.annotation.VisibleForTesting;		import androidx.annotation.VisibleForTesting;

			import com.android.systemui.Dumpable;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.animation.Interpolators;		import com.android.systemui.animation.Interpolators;
			import com.android.systemui.dump.DumpManager;
	import com.android.systemui.media.MediaHost;		import com.android.systemui.media.MediaHost;
	import com.android.systemui.plugins.FalsingManager;		import com.android.systemui.plugins.FalsingManager;
	import com.android.systemui.plugins.qs.QS;		import com.android.systemui.plugins.qs.QS;
	@@ -131,6 +133,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	*/		*/
	private boolean mAnimateNextQsUpdate;		private boolean mAnimateNextQsUpdate;

			private DumpManager mDumpManager;

	@Inject		@Inject
	public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,		public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,
	InjectionInflationController injectionInflater, QSTileHost qsTileHost,		InjectionInflationController injectionInflater, QSTileHost qsTileHost,
	@@ -139,7 +143,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	@Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,		@Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,
	KeyguardBypassController keyguardBypassController,		KeyguardBypassController keyguardBypassController,
	QSFragmentComponent.Factory qsComponentFactory,		QSFragmentComponent.Factory qsComponentFactory,
	FalsingManager falsingManager) {		FalsingManager falsingManager, DumpManager dumpManager) {
	mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;		mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;
	mInjectionInflater = injectionInflater;		mInjectionInflater = injectionInflater;
	mCommandQueue = commandQueue;		mCommandQueue = commandQueue;
	@@ -152,6 +156,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	mFalsingManager = falsingManager;		mFalsingManager = falsingManager;
	mBypassController = keyguardBypassController;		mBypassController = keyguardBypassController;
	mStatusBarStateController = statusBarStateController;		mStatusBarStateController = statusBarStateController;
			mDumpManager = dumpManager;
	}		}

	@Override		@Override
	@@ -197,6 +202,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	mQSContainerImplController = qsFragmentComponent.getQSContainerImplController();		mQSContainerImplController = qsFragmentComponent.getQSContainerImplController();
	mQSContainerImplController.init();		mQSContainerImplController.init();
	mContainer = mQSContainerImplController.getView();		mContainer = mQSContainerImplController.getView();
			mDumpManager.registerDumpable(mContainer.getClass().getName(), mContainer);

	mQSDetail.setQsPanel(mQSPanelController, mHeader, mFooter, mFalsingManager);		mQSDetail.setQsPanel(mQSPanelController, mHeader, mFooter, mFalsingManager);
	mQSAnimator = qsFragmentComponent.getQSAnimator();		mQSAnimator = qsFragmentComponent.getQSAnimator();
	@@ -248,6 +254,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	mQSCustomizerController.setQs(null);		mQSCustomizerController.setQs(null);
	mQsDetailDisplayer.setQsPanelController(null);		mQsDetailDisplayer.setQsPanelController(null);
	mScrollListener = null;		mScrollListener = null;
			mDumpManager.unregisterDumpable(mContainer.getClass().getName());
	}		}

	@Override		@Override

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

+13 −4

Original line number	Original line	Diff line number	Diff line
	@@ -671,6 +671,9 @@ public class NotificationPanelViewController extends PanelViewController {
	private int mScreenCornerRadius;		private int mScreenCornerRadius;
	private boolean mQSAnimatingHiddenFromCollapsed;		private boolean mQSAnimatingHiddenFromCollapsed;

			private int mQsClipTop;
			private int mQsClipBottom;
			private boolean mQsVisible;
	private final ContentResolver mContentResolver;		private final ContentResolver mContentResolver;

	private final Executor mUiExecutor;		private final Executor mUiExecutor;
	@@ -2531,9 +2534,12 @@ public class NotificationPanelViewController extends PanelViewController {
	mQsTranslationForFullShadeTransition = qsTranslation;		mQsTranslationForFullShadeTransition = qsTranslation;
	updateQsFrameTranslation();		updateQsFrameTranslation();
	float currentTranslation = mQsFrame.getTranslationY();		float currentTranslation = mQsFrame.getTranslationY();
	mQs.setFancyClipping((		mQsClipTop = (int) (top - currentTranslation);
	int) (top - currentTranslation),		mQsClipBottom = (int) (bottom - currentTranslation);
	(int) (bottom - currentTranslation),		mQsVisible = qsVisible;
			mQs.setFancyClipping(
			mQsClipTop,
			mQsClipBottom,
	radius, qsVisible		radius, qsVisible
	&& !mShouldUseSplitNotificationShade);		&& !mShouldUseSplitNotificationShade);
	}		}
	@@ -3862,7 +3868,10 @@ public class NotificationPanelViewController extends PanelViewController {
	@Override		@Override
	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	super.dump(fd, pw, args);		super.dump(fd, pw, args);
	pw.println(" gestureExclusionRect: " + calculateGestureExclusionRect());		pw.println(" gestureExclusionRect: " + calculateGestureExclusionRect()
			+ " applyQSClippingImmediately: top(" + mQsClipTop + ") bottom(" + mQsClipBottom
			+ ") qsVisible(" + mQsVisible
			);
	if (mKeyguardStatusBarViewController != null) {		if (mKeyguardStatusBarViewController != null) {
	mKeyguardStatusBarViewController.dump(fd, pw, args);		mKeyguardStatusBarViewController.dump(fd, pw, args);
	}		}

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -186,6 +186,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest {
	mQQSMediaHost,		mQQSMediaHost,
	mBypassController,		mBypassController,
	mQsComponentFactory,		mQsComponentFactory,
	mFalsingManager);		mFalsingManager,
			mock(DumpManager.class));
	}		}
	}		}