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

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

Merge "Extract most QS code from NPVC" into tm-qpr-dev am: d82af723 am: 7b04bad3 

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



Change-Id: Ie18ef379af03d0f80b22dee8e4eef66d9b9eaeac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17d266ac 7b04bad3

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

+14 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class DebugDrawable extends Drawable { 
    private final NotificationPanelView mView;

    private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    private final LockIconViewController mLockIconViewController;

    private final QuickSettingsController mQsController;

    private final Set<Integer> mDebugTextUsedYPositions;

    private final Paint mDebugPaint;
@@ -46,12 +47,14 @@ public class DebugDrawable extends Drawable { 
            NotificationPanelViewController notificationPanelViewController,

            NotificationPanelView notificationPanelView,

            NotificationStackScrollLayoutController notificationStackScrollLayoutController,

            LockIconViewController lockIconViewController

            LockIconViewController lockIconViewController,

            QuickSettingsController quickSettingsController

    ) {

        mNotificationPanelViewController = notificationPanelViewController;

        mView = notificationPanelView;

        mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;

        mLockIconViewController = lockIconViewController;

        mQsController = quickSettingsController;

        mDebugTextUsedYPositions = new HashSet<>();

        mDebugPaint = new Paint();

    }
@@ -71,12 +74,19 @@ public class DebugDrawable extends Drawable { 
                Color.RED, "getMaxPanelHeight()");

        drawDebugInfo(canvas, (int) mNotificationPanelViewController.getExpandedHeight(),

                Color.BLUE, "getExpandedHeight()");

        drawDebugInfo(canvas, mNotificationPanelViewController.calculatePanelHeightQsExpanded(),

        drawDebugInfo(canvas, mQsController.calculatePanelHeightExpanded(

                        mNotificationPanelViewController.getClockPositionResult()

                                .stackScrollerPadding),

                Color.GREEN, "calculatePanelHeightQsExpanded()");

        drawDebugInfo(canvas, mNotificationPanelViewController.calculatePanelHeightQsExpanded(),

        drawDebugInfo(canvas, mQsController.calculatePanelHeightExpanded(

                        mNotificationPanelViewController.getClockPositionResult()

                                .stackScrollerPadding),

                Color.YELLOW, "calculatePanelHeightShade()");

        drawDebugInfo(canvas,

                (int) mNotificationPanelViewController.calculateNotificationsTopPadding(),

                (int) mQsController.calculateNotificationsTopPadding(

                        mNotificationPanelViewController.isExpanding(),

                        mNotificationPanelViewController.getKeyguardNotificationStaticPadding(),

                        mNotificationPanelViewController.getExpandedFraction()),

                Color.MAGENTA, "calculateNotificationsTopPadding()");

        drawDebugInfo(canvas, mNotificationPanelViewController.getClockPositionResult().clockY,

                Color.GRAY, "mClockPositionResult.clockY");