Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

FlutterFragment predictive back #52302

Merged
justinmc merged 12 commits into from
May 28, 2024
Merged

FlutterFragment predictive back #52302

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89629fb
Seems to work whether Flutter is the first acitivty or not
justinmc Aug 18, 2023
bf4e1ec
Work with original onBackPressed mechanics
justinmc Aug 18, 2023
c396216
Merge branch 'main' into flutter-fragment-predictive-back
justinmc Apr 22, 2024
1ae637d
Fix from math1man review https://github.com/flutter/engine/pull/44865…
justinmc Apr 22, 2024
7cd3383
popSystemNavigator should restore onBackPressedCallback to original s…
justinmc Apr 23, 2024
3733332
Test that popSystemNavigator preserves enabled state
justinmc Apr 24, 2024
0d95e27
An attempt at testing the callback being enabled/disabled, but not wo…
justinmc Apr 24, 2024
6d69cfc
Merge branch 'main' into flutter-fragment-predictive-back
justinmc May 16, 2024
c06300a
Fix flipped logic, and add comments explaining what's going on
justinmc May 17, 2024
48765ee
Merge branch 'main' into flutter-fragment-predictive-back
justinmc May 28, 2024
c785e98
Clarify comment
justinmc May 28, 2024
1ff7c32
Whoops, should have gotten this in the merge commit
justinmc May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into flutter-fragment-predictive-back
  • Loading branch information
@justinmc
justinmc committed May 28, 2024
commit 48765ee16c46679552e921fca8cd2be9118a3209
2 changes: 1 addition & 1 deletion shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public void itDelegatesOnBackPressedWithSetFrameworkHandlesBack() {

// Calling onBackPressed now will still be handled by Android (the default),
Copy link
Contributor

@reidbaker reidbaker May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reading this test shouldn't the back pressed be handled by the framework because of the code on 306?

Copy link
Contributor Author

@justinmc justinmc May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comment above should help explain this a bit. shouldAutomaticallyHandleOnBackPressed enables predictive back, while setFrameworkHandlesBack determines whether Android or the framework handle the back gesture.

// until setFrameworkHandlesBack is set to true.
activity.onBackPressed();
activity.getOnBackPressedDispatcher().onBackPressed();
verify(mockDelegate, times(0)).onBackPressed();

// Setting setFrameworkHandlesBack to true means the delegate will receive
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.