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

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

Merge "Removing logs introduced to debug b/219589379" into udc-qpr-dev am: da9cc565 

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



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

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

+1 −10
Original line number Diff line number Diff line
@@ -780,7 +780,6 @@ public class QuickSettingsController implements Dumpable { 


    /** update Qs height state */

    public void setExpansionHeight(float height) {

        checkCorrectSplitShadeState(height);

        int maxHeight = getMaxExpansionHeight();

        height = Math.min(Math.max(

                height, getMinExpansionHeight()), maxHeight);
@@ -802,14 +801,6 @@ public class QuickSettingsController implements Dumpable { 
        }

    }



    /** TODO(b/269742565) Remove this logging */

    private void checkCorrectSplitShadeState(float height) {

        if (mSplitShadeEnabled && height == 0

                && mPanelViewControllerLazy.get().isShadeFullyExpanded()) {

            Log.wtfStack(TAG, "qsExpansion set to 0 while split shade is expanding or open");

        }

    }



    /** */

    public void setHeightOverrideToDesiredHeight() {

        if (isSizeChangeAnimationRunning() && isQsFragmentCreated()) {
@@ -1939,7 +1930,7 @@ public class QuickSettingsController implements Dumpable { 
                target = getMaxExpansionHeight();

                break;

            case FLING_COLLAPSE:

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

                if (mSplitShadeEnabled) {

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

                }

                setExpandImmediate(false);