Merge "Removed calls to NPVC.getView()" into tm-qpr-dev (c11ec4ac) · Commits · e / os / android_frameworks_base

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

+23 −3

Original line number	Diff line number	Diff line
		@@ -680,7 +680,7 @@ public final class NotificationPanelViewController implements Dumpable {
		};
		private final Runnable mMaybeHideExpandedRunnable = () -> {
		if (getExpansionFraction() == 0.0f) {
		getView().post(mHideExpandedRunnable);
		postToView(mHideExpandedRunnable);
		}
		};

		@@ -2815,7 +2815,7 @@ public final class NotificationPanelViewController implements Dumpable {
		return top + mNotificationStackScrollLayoutController.getHeight()
		+ mSplitShadeNotificationsScrimMarginBottom;
		} else {
		return getView().getBottom();
		return mView.getBottom();
		}
		}

		@@ -2830,7 +2830,7 @@ public final class NotificationPanelViewController implements Dumpable {

		private int calculateRightQsClippingBound() {
		if (mIsFullWidth) {
		return getView().getRight() + mDisplayRightInset;
		return mView.getRight() + mDisplayRightInset;
		} else {
		return mNotificationStackScrollLayoutController.getRight();
		}
		@@ -5195,6 +5195,26 @@ public final class NotificationPanelViewController implements Dumpable {
		return mView;
		}

		/** */
		public boolean postToView(Runnable action) {
		return mView.post(action);
		}

		/** */
		public boolean sendInterceptTouchEventToView(MotionEvent event) {
		return mView.onInterceptTouchEvent(event);
		}

		/** */
		public void requestLayoutOnView() {
		mView.requestLayout();
		}

		/** */
		public void resetViewAlphas() {
		ViewGroupFadeHelper.reset(mView);
		}

		private void beginJankMonitoring() {
		if (mInteractionJankMonitor == null) {
		return;

+1 −1

Original line number	Diff line number	Diff line
		@@ -316,7 +316,7 @@ public class NotificationShadeWindowViewController {
		MotionEvent cancellation = MotionEvent.obtain(ev);
		cancellation.setAction(MotionEvent.ACTION_CANCEL);
		mStackScrollLayout.onInterceptTouchEvent(cancellation);
		mNotificationPanelViewController.getView().onInterceptTouchEvent(cancellation);
		mNotificationPanelViewController.sendInterceptTouchEventToView(cancellation);
		cancellation.recycle();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ public class ShadeControllerImpl implements ShadeController {
		if (getCentralSurfaces().getNotificationShadeWindowView()
		.isVisibleToUser()) {
		getNotificationPanelViewController().removeOnGlobalLayoutListener(this);
		getNotificationPanelViewController().getView().post(executable);
		getNotificationPanelViewController().postToView(executable);
		}
		}
		});

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,9 +72,9 @@ public class StatusBarHeadsUpChangeListener implements OnHeadsUpChangedListener
		//resize the layout. Let's
		// make sure that the window stays small for one frame until the
		//touchableRegion is set.
		mNotificationPanelViewController.getView().requestLayout();
		mNotificationPanelViewController.requestLayoutOnView();
		mNotificationShadeWindowController.setForceWindowCollapsed(true);
		mNotificationPanelViewController.getView().post(() -> {
		mNotificationPanelViewController.postToView(() -> {
		mNotificationShadeWindowController.setForceWindowCollapsed(false);
		});
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.RemoteInputController;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.notification.ViewGroupFadeHelper;
		import com.android.systemui.statusbar.phone.KeyguardBouncer.PrimaryBouncerExpansionCallback;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		@@ -1017,7 +1016,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		public void onKeyguardFadedAway() {
		mNotificationContainer.postDelayed(() -> mNotificationShadeWindowController
		.setKeyguardFadingAway(false), 100);
		ViewGroupFadeHelper.reset(mNotificationPanelViewController.getView());
		mNotificationPanelViewController.resetViewAlphas();
		mCentralSurfaces.finishKeyguardFadingAway();
		mBiometricUnlockController.finishKeyguardFadingAway();
		WindowManagerGlobal.getInstance().trimMemory(