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

Commit b2ddeb8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add tracing for setEdgeBackPlugin" into tm-qpr-dev am: 95a1377b 

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



Change-Id: I1593970ee96c322224b78121d91dd4b2b96f0e01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3253c7a2 95a1377b

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+20 −6
Original line number Diff line number Diff line
@@ -501,6 +501,15 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    }



    private void updateIsEnabled() {

        try {

            Trace.beginSection("EdgeBackGestureHandler#updateIsEnabled");

            updateIsEnabledTraced();

        } finally {

            Trace.endSection();

        }

    }



    private void updateIsEnabledTraced() {

        boolean isEnabled = mIsAttached && mIsGesturalModeEnabled;

        if (isEnabled == mIsEnabled) {

            return;
@@ -586,6 +595,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    }



    private void setEdgeBackPlugin(NavigationEdgeBackPlugin edgeBackPlugin) {

        try {

            Trace.beginSection("setEdgeBackPlugin");

            if (mEdgeBackPlugin != null) {

                mEdgeBackPlugin.onDestroy();

            }
@@ -593,6 +604,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            mEdgeBackPlugin.setBackCallback(mBackCallback);

            mEdgeBackPlugin.setLayoutParams(createLayoutParams());

            updateDisplaySize();

        } finally {

            Trace.endSection();

        }

    }



    public boolean isHandlingGestures() {