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

Commit cc28fbd0 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Add logs to ensure that QS / NPVC clip bounds match am: 0f8dfa53

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

Change-Id: Ic3064b01549374a4c1b687f8c6b241cb19c45ccc
parents 8b4620cd 0f8dfa53
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -28,13 +28,17 @@ import android.view.View;
import android.view.WindowInsets;
import android.widget.FrameLayout;

import com.android.systemui.Dumpable;
import com.android.systemui.R;
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}
 */
public class QSContainerImpl extends FrameLayout {
public class QSContainerImpl extends FrameLayout implements Dumpable {

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

    @Override
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
        pw.println(getClass().getSimpleName() + " updateClippingPath: top("
                + mFancyClippingTop + ") bottom(" + mFancyClippingBottom  + ") mClippingEnabled("
                + mClippingEnabled + ")");
    }
}
+8 −1
Original line number Diff line number Diff line
@@ -36,8 +36,10 @@ import android.widget.FrameLayout.LayoutParams;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

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

    private DumpManager mDumpManager;

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

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

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

    @Override
+13 −4
Original line number Diff line number Diff line
@@ -631,6 +631,9 @@ public class NotificationPanelViewController extends PanelViewController {
    private int mScreenCornerRadius;
    private boolean mQSAnimatingHiddenFromCollapsed;

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

    private final Executor mUiExecutor;
@@ -2402,9 +2405,12 @@ public class NotificationPanelViewController extends PanelViewController {
            mQsTranslationForFullShadeTransition = qsTranslation;
            updateQsFrameTranslation();
            float currentTranslation = mQsFrame.getTranslationY();
            mQs.setFancyClipping((
                    int) (top - currentTranslation),
                    (int) (bottom - currentTranslation),
            mQsClipTop = (int) (top - currentTranslation);
            mQsClipBottom = (int) (bottom - currentTranslation);
            mQsVisible = qsVisible;
            mQs.setFancyClipping(
                    mQsClipTop,
                    mQsClipBottom,
                    radius, qsVisible
                    && !mShouldUseSplitNotificationShade);
        }
@@ -3733,7 +3739,10 @@ public class NotificationPanelViewController extends PanelViewController {
    @Override
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
        super.dump(fd, pw, args);
        pw.println("    gestureExclusionRect: " + calculateGestureExclusionRect());
        pw.println("    gestureExclusionRect: " + calculateGestureExclusionRect()
                + " applyQSClippingImmediately: top(" + mQsClipTop + ") bottom(" + mQsClipBottom
                + ") qsVisible(" + mQsVisible
        );
        if (mKeyguardStatusBar != null) {
            mKeyguardStatusBar.dump(fd, pw, args);
        }
+2 −1
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest {
                mBypassController,
                mQsComponentFactory,
                mFeatureFlags,
                mFalsingManager);
                mFalsingManager,
                mock(DumpManager.class));
    }
}