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

Commit bf394392 authored by Helen Cheuk's avatar Helen Cheuk Committed by Android (Google) Code Review
Browse files

Merge "[Contextual Edu] Show dialog after back gesture completed" into main

parents 96235f48 05179b9b

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

+5 −2
Original line number Diff line number Diff line
@@ -326,6 +326,11 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                    logGesture(mInRejectedExclusion

                            ? SysUiStatsLog.BACK_GESTURE__TYPE__COMPLETED_REJECTED

                            : SysUiStatsLog.BACK_GESTURE__TYPE__COMPLETED);

                    if (!mInRejectedExclusion) {

                        // Log successful back gesture to contextual edu stats

                        mOverviewProxyService.updateContextualEduStats(mIsTrackpadThreeFingerSwipe,

                                GestureType.BACK);

                    }

                }



                @Override
@@ -1153,8 +1158,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
                        if (mAllowGesture) {

                            if (mBackAnimation != null) {

                                mBackAnimation.onThresholdCrossed();

                                mOverviewProxyService.updateContextualEduStats(

                                        mIsTrackpadThreeFingerSwipe, GestureType.BACK);

                            } else {

                                pilferPointers();

                            }