| commit | e7ebddb87d937d8d24f2321c41230e8ab87f3721 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 23 03:32:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 23 03:32:12 2021 +0000 |
| tree | 657b9ceae985bd88d20aea3fec0982caeb82a8d1 | |
| parent | 93e09e46ba3c5fe736a9ab67417825fb65345202 [diff] | |
| parent | 4223ee98ea44baf1340942d443f634ca50ca2521 [diff] |
Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev am: 4223ee98ea Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824476 Change-Id: I81f6a07456d2fbd3c10795caa5c0af2ef34fc1fb
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b82bb76..d5730a1 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java
@@ -380,6 +380,7 @@ // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it. final Intent trampolineIntent = new Intent(android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK); + trampolineIntent.replaceExtras(intent); trampolineIntent.putExtra( android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI, intent.toUri(Intent.URI_INTENT_SCHEME));
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index c065c75..5df7b7a 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -213,6 +213,9 @@ targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK); + // Sender of intent may want to send intent extra data to the destination of targetIntent. + targetIntent.replaceExtras(intent); + targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true); // Set 2-pane pair rule for the deep link page.