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

Commit e2e0a20c authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Logging when QS fling happens and when split shade state changes" into... 

Merge "Logging when QS fling happens and when split shade state changes" into tm-qpr-dev am: ab32ea36 am: f529dcd8

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



Change-Id: I9d179120de4a3bc4b28e65b34ff2fb11a3da6845
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf6e3e7f f529dcd8

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

+1 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    }



    private void onSplitShadeEnabledChanged() {

        mShadeLog.logSplitShadeChanged(mSplitShadeEnabled);

        // when we switch between split shade and regular shade we want to enforce setting qs to

        // the default state: expanded for split shade and collapsed otherwise

        if (!isOnKeyguard() && mPanelExpanded) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1710,12 +1710,16 @@ public class QuickSettingsController { 
     */

    private void flingQs(float vel, int type, final Runnable onFinishRunnable,

            boolean isClick) {

        mShadeLog.flingQs(type, isClick);

        float target;

        switch (type) {

            case FLING_EXPAND:

                target = getMaxExpansionHeight();

                break;

            case FLING_COLLAPSE:

                if (mSplitShadeEnabled) { // TODO:(b/269742565) remove below log

                    Log.wtfStack(TAG, "FLING_COLLAPSE called in split shade");

                }

                target = getMinExpansionHeight();

                break;

            case FLING_HIDE:

packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt

+36 −11
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ import android.view.MotionEvent 
import com.android.systemui.log.dagger.ShadeLog

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.plugins.log.LogLevel

import com.android.systemui.shade.NotificationPanelViewController.FLING_COLLAPSE

import com.android.systemui.shade.NotificationPanelViewController.FLING_EXPAND

import com.android.systemui.shade.NotificationPanelViewController.FLING_HIDE

import com.google.errorprone.annotations.CompileTimeConstant

import javax.inject.Inject
@@ -241,18 +244,40 @@ class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) { 
        )

    }



    fun logLastFlingWasExpanding(

            expand: Boolean

    ) {

    fun logLastFlingWasExpanding(expand: Boolean) {

        buffer.log(

            TAG,

            LogLevel.VERBOSE,

            { bool1 = expand },

            { "NPVC mLastFlingWasExpanding set to: $bool1" }

        )

    }



    fun flingQs(flingType: Int, isClick: Boolean) {

        buffer.log(

            TAG,

            LogLevel.VERBOSE,

            {

                    bool1 = expand

                str1 = flingTypeToString(flingType)

                bool1 = isClick

            },

                {

                    "NPVC mLastFlingWasExpanding set to: $bool1"

            { "QS fling with type $str1, originated from click: $isClick" }

        )

    }



    private fun flingTypeToString(flingType: Int) = when (flingType) {

        FLING_EXPAND -> "FLING_EXPAND"

        FLING_COLLAPSE -> "FLING_COLLAPSE"

        FLING_HIDE -> "FLING_HIDE"

        else -> "UNKNOWN"

    }



    fun logSplitShadeChanged(splitShadeEnabled: Boolean) {

        buffer.log(

            TAG,

            LogLevel.VERBOSE,

            { bool1 = splitShadeEnabled },

            { "Split shade state changed: split shade ${if (bool1) "enabled" else "disabled"}" }

        )

    }

}