From 8b1e5d9d7de3d73911b497a568a88307894eef0a Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Tue, 13 Dec 2022 08:05:49 +0000 Subject: [PATCH] Revert "Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow" This reverts commit ea1580f92b9c8b0f33a86c6a1af872fd416b03d7. Reason for revert: 1. Search result trampoline should have that result sent back to the reply target of the original activity. 2. To leverage the behavior of handheld's deep link case, large screen's deep link should forward the result. Change-Id: I55303070e35fc9430063655e0a9a0fd72e0823ac --- src/com/android/settings/SettingsActivity.java | 1 + src/com/android/settings/homepage/SettingsHomepageActivity.java | 2 ++ src/com/android/settings/search/SearchResultTrampoline.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index fd3fcdf0acf..4341851c3fa 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -415,6 +415,7 @@ public class SettingsActivity extends SettingsBaseActivity trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, highlightMenuKey); + trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); return trampolineIntent; } diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index 7752f32e2f5..bad4a19c351 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -173,6 +173,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements if (userInfo.isManagedProfile()) { final Intent intent = new Intent(getIntent()) .setClass(this, DeepLinkHomepageActivityInternal.class) + .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT) .putExtra(EXTRA_USER_HANDLE, getUser()); intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivityAsUser(intent, um.getPrimaryUser().getUserHandle()); @@ -450,6 +451,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements intent.setAction(null); targetIntent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT); + targetIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); // Sender of intent may want to send intent extra data to the destination of targetIntent. targetIntent.replaceExtras(intent); diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java index 7718ff36330..5e710293c2c 100644 --- a/src/com/android/settings/search/SearchResultTrampoline.java +++ b/src/com/android/settings/search/SearchResultTrampoline.java @@ -95,6 +95,8 @@ public class SearchResultTrampoline extends Activity { } } + intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); + if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) { startActivity(intent); } else if (isSettingsIntelligence(callingActivity)) {