Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a8c147 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Removed calls to NPVC.getView()" into tm-qpr-dev am: c11ec4ac 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20472791



Change-Id: Ie20c1cab7910109c0c9b2cba83c2bd8b97d3a020
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76111f60 c11ec4ac

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

+23 −3
Original line number Original line Diff line number Diff line
@@ -680,7 +680,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    };

    };

    private final Runnable mMaybeHideExpandedRunnable = () -> {

    private final Runnable mMaybeHideExpandedRunnable = () -> {

        if (getExpansionFraction() == 0.0f) {

        if (getExpansionFraction() == 0.0f) {

            getView().post(mHideExpandedRunnable);

            postToView(mHideExpandedRunnable);

        }

        }

    };

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

            return top + mNotificationStackScrollLayoutController.getHeight()

                    + mSplitShadeNotificationsScrimMarginBottom;

                    + mSplitShadeNotificationsScrimMarginBottom;

        } else {

        } else {

            return getView().getBottom();

            return mView.getBottom();

        }

        }

    }

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




    private int calculateRightQsClippingBound() {

    private int calculateRightQsClippingBound() {

        if (mIsFullWidth) {

        if (mIsFullWidth) {

            return getView().getRight() + mDisplayRightInset;

            return mView.getRight() + mDisplayRightInset;

        } else {

        } else {

            return mNotificationStackScrollLayoutController.getRight();

            return mNotificationStackScrollLayoutController.getRight();

        }

        }
@@ -5195,6 +5195,26 @@ public final class NotificationPanelViewController implements Dumpable { 
        return mView;

        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() {

    private void beginJankMonitoring() {

        if (mInteractionJankMonitor == null) {

        if (mInteractionJankMonitor == null) {

            return;

            return;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,7 @@ public class NotificationShadeWindowViewController { 
                MotionEvent cancellation = MotionEvent.obtain(ev);

                MotionEvent cancellation = MotionEvent.obtain(ev);

                cancellation.setAction(MotionEvent.ACTION_CANCEL);

                cancellation.setAction(MotionEvent.ACTION_CANCEL);

                mStackScrollLayout.onInterceptTouchEvent(cancellation);

                mStackScrollLayout.onInterceptTouchEvent(cancellation);

                mNotificationPanelViewController.getView().onInterceptTouchEvent(cancellation);

                mNotificationPanelViewController.sendInterceptTouchEventToView(cancellation);

                cancellation.recycle();

                cancellation.recycle();

            }

            }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ public class ShadeControllerImpl implements ShadeController { 
                        if (getCentralSurfaces().getNotificationShadeWindowView()

                        if (getCentralSurfaces().getNotificationShadeWindowView()

                                .isVisibleToUser()) {

                                .isVisibleToUser()) {

                            getNotificationPanelViewController().removeOnGlobalLayoutListener(this);

                            getNotificationPanelViewController().removeOnGlobalLayoutListener(this);

                            getNotificationPanelViewController().getView().post(executable);

                            getNotificationPanelViewController().postToView(executable);

                        }

                        }

                    }

                    }

                });

                });

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,9 +72,9 @@ public class StatusBarHeadsUpChangeListener implements OnHeadsUpChangedListener 
                //resize the layout. Let's

                //resize the layout. Let's

                // make sure that the window stays small for one frame until the

                // make sure that the window stays small for one frame until the

                //touchableRegion is set.

                //touchableRegion is set.

                mNotificationPanelViewController.getView().requestLayout();

                mNotificationPanelViewController.requestLayoutOnView();

                mNotificationShadeWindowController.setForceWindowCollapsed(true);

                mNotificationShadeWindowController.setForceWindowCollapsed(true);

                mNotificationPanelViewController.getView().post(() -> {

                mNotificationPanelViewController.postToView(() -> {

                    mNotificationShadeWindowController.setForceWindowCollapsed(false);

                    mNotificationShadeWindowController.setForceWindowCollapsed(false);

                });

                });

            }

            }

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

+1 −2
Original line number Original line 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.RemoteInputController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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.phone.KeyguardBouncer.PrimaryBouncerExpansionCallback;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -1017,7 +1016,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    public void onKeyguardFadedAway() {

    public void onKeyguardFadedAway() {

        mNotificationContainer.postDelayed(() -> mNotificationShadeWindowController

        mNotificationContainer.postDelayed(() -> mNotificationShadeWindowController

                        .setKeyguardFadingAway(false), 100);

                        .setKeyguardFadingAway(false), 100);

        ViewGroupFadeHelper.reset(mNotificationPanelViewController.getView());

        mNotificationPanelViewController.resetViewAlphas();

        mCentralSurfaces.finishKeyguardFadingAway();

        mCentralSurfaces.finishKeyguardFadingAway();

        mBiometricUnlockController.finishKeyguardFadingAway();

        mBiometricUnlockController.finishKeyguardFadingAway();

        WindowManagerGlobal.getInstance().trimMemory(

        WindowManagerGlobal.getInstance().trimMemory(