Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev am: 4223ee98ea am: e7ebddb87d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824476

Change-Id: I374926b60b58d2867dd9553bf962911a7493540c

src/com/android/settings/SettingsActivity.java

@@ -380,6 +380,7 @@ public class SettingsActivity extends SettingsBaseActivity
         // 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));

src/com/android/settings/homepage/SettingsHomepageActivity.java

@@ -213,6 +213,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
 
         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.