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

[Android] Save back handling state in Activity/Fragment bundle #56715

Merged
auto-submit merged 12 commits into from
Dec 4, 2024
Merged

[Android] Save back handling state in Activity/Fragment bundle #56715

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8203403
modify interface, and add implementation for saving setFrameworkHandl…
Nov 19, 2024
1e675e7
use the state
Nov 19, 2024
314c4ca
format
Nov 19, 2024
3488987
fix test broken by new element of host interface
Nov 19, 2024
c912bf8
add a test
Nov 19, 2024
50337ca
ffa tests
Nov 20, 2024
4cd8e7b
format
Nov 20, 2024
ebb59e1
don't keep state if engine will be destroyed
Nov 20, 2024
7d04aed
review feedback
Dec 3, 2024
3441a80
format
Dec 3, 2024
e304ac4
Merge branch 'main' into maintain_pb_state
gmackall Dec 4, 2024
2ce73ef
review feedback
Dec 4, 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
review feedback
  • Loading branch information
Gray Mackall committed Dec 3, 2024
commit 7d04aedaaa3d020f279ec378ab0bddc6b2cda6ec
7 changes: 3 additions & 4 deletions shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,10 +634,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {

super.onCreate(savedInstanceState);

if (savedInstanceState != null
&& savedInstanceState.getBoolean(
FlutterActivityAndFragmentDelegate.ON_BACK_CALLBACK_ENABLED_KEY)) {
setFrameworkHandlesBack(true);
if (savedInstanceState != null) {
boolean frameworkHandlesBack = savedInstanceState.getBoolean(FlutterActivityAndFragmentDelegate.ON_BACK_CALLBACK_ENABLED_KEY);
setFrameworkHandlesBack(frameworkHandlesBack);
}

delegate = new FlutterActivityAndFragmentDelegate(this);
Expand Down
7 changes: 3 additions & 4 deletions shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,10 +1072,9 @@ public void onAttach(@NonNull Context context) {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null
&& savedInstanceState.getBoolean(
FlutterActivityAndFragmentDelegate.ON_BACK_CALLBACK_ENABLED_KEY)) {
onBackPressedCallback.setEnabled(true);
if (savedInstanceState != null) {
boolean frameworkHandlesBack = savedInstanceState.getBoolean(FlutterActivityAndFragmentDelegate.ON_BACK_CALLBACK_ENABLED_KEY);
onBackPressedCallback.setEnabled(frameworkHandlesBack);
}
delegate.onRestoreInstanceState(savedInstanceState);
}
Expand Down