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

Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-23 03:19:09 +00:00
committed by Android (Google) Code Review
parent 8ab5c92adc e4084028b3
commit 4223ee98ea
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,6 +380,7 @@ public class SettingsActivity extends SettingsBaseActivity
// It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it. // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.
final Intent trampolineIntent = final Intent trampolineIntent =
new Intent(android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK); new Intent(android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK);
trampolineIntent.replaceExtras(intent);
trampolineIntent.putExtra( trampolineIntent.putExtra(
android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI, android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI,
intent.toUri(Intent.URI_INTENT_SCHEME)); intent.toUri(Intent.URI_INTENT_SCHEME));

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

@@ -213,6 +213,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK); 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); targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);
// Set 2-pane pair rule for the deep link page. // Set 2-pane pair rule for the deep link page.