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

Commit 3eaad8d8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add setTriggerBack interface to BackCallback." into tm-qpr-dev... 

Merge "Merge "Add setTriggerBack interface to BackCallback." into tm-qpr-dev am: baa507a5" into tm-qpr-dev-plus-aosp am: 281e7f69

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



Change-Id: Ib32eb754020fe7c090e7b89abd8702d48c887ff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d91b3319 281e7f69

packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java

+8 −0
Original line number Diff line number Diff line
@@ -61,5 +61,13 @@ public interface NavigationEdgeBackPlugin extends Plugin { 


        /** Indicates that the gesture was cancelled and the system should not go back. */

        void cancelBack();



        /**

         * Indicates if back will be triggered if committed in current state.

         *

         * @param triggerBack if back will be triggered in current state.

         */

        // TODO(b/247883311): Remove default impl once SwipeBackGestureHandler overrides this.

        default void setTriggerBack(boolean triggerBack) {}

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -303,6 +303,13 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
                    mOverviewProxyService.notifyBackAction(false, (int) mDownPoint.x,

                            (int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);

                }



                @Override

                public void setTriggerBack(boolean triggerBack) {

                    if (mBackAnimation != null) {

                        mBackAnimation.setTriggerBack(triggerBack);

                    }

                }

            };



    private final SysUiState.SysUiStateCallback mSysUiStateCallback =

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

+1 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
            // Whenever the trigger back state changes the existing translation animation should be

            // cancelled

            mTranslationAnimation.cancel();

            mBackCallback.setTriggerBack(mTriggerBack);

        }

    }