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

Merge "Fix not able to add Settings shortcut widget problem" into sc-v2-dev am: 7655d161ff

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

Change-Id: I2a982c636bcf7b7709c697a3bfaaa41e5999bbeb
This commit is contained in:
TreeHugger Robot
2021-09-23 08:12:32 +00:00
committed by Automerger Merge Worker
parent da247a3042 7655d161ff
commit f6bdd8eb96
2 changed files with 2 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

@@ -384,6 +384,7 @@ public class SettingsActivity extends SettingsBaseActivity
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));
trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(trampolineIntent); startActivity(trampolineIntent);
return true; return true;

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

@@ -212,6 +212,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
intent.setAction(null); intent.setAction(null);
targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK); targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);
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);