PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow

Browse Source 
Settings$CreateShortcutActivity does not necessary to be
displayed in 2-pane and it seems no scenario needs the flag
Intent.FLAG_ACTIVITY_FORWARD_RESULT.

Bug: 241346847
Test: build pass
Change-Id: I7a8fca61b453db70233b151711df516649424e3a
This commit is contained in:
Arc Wang
2022-08-04 16:24:35 +08:00
parent 66479d6de4
commit ea1580f92b
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/SettingsActivity.java
View File

@@ -415,7 +415,6 @@ public class SettingsActivity extends SettingsBaseActivity
trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY,
highlightMenuKey); highlightMenuKey);
trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
return trampolineIntent; return trampolineIntent;
} }

2
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -173,7 +173,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
final Intent intent = new Intent(getIntent()) final Intent intent = new Intent(getIntent())
.setClass(this, DeepLinkHomepageActivityInternal.class) .setClass(this, DeepLinkHomepageActivityInternal.class)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.putExtra(EXTRA_USER_HANDLE, getUser()); .putExtra(EXTRA_USER_HANDLE, getUser());
intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivityAsUser(intent, um.getPrimaryUser().getUserHandle()); startActivityAsUser(intent, um.getPrimaryUser().getUserHandle());
@@ -451,7 +450,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
intent.setAction(null); intent.setAction(null);
targetIntent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT); 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. // Sender of intent may want to send intent extra data to the destination of targetIntent.
targetIntent.replaceExtras(intent); targetIntent.replaceExtras(intent);

2
src/com/android/settings/search/SearchResultTrampoline.java
View File

@@ -95,8 +95,6 @@ public class SearchResultTrampoline extends Activity {
} }
} }
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) { if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) {
startActivity(intent); startActivity(intent);
} else if (isSettingsIntelligence(callingActivity)) { } else if (isSettingsIntelligence(callingActivity)) {