Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7655d161 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 768722fe 4dd3f113

src/com/android/settings/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ public class SettingsActivity extends SettingsBaseActivity 
        trampolineIntent.putExtra(

                android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI,

                intent.toUri(Intent.URI_INTENT_SCHEME));

        trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);

        startActivity(trampolineIntent);



        return true;

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

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        intent.setAction(null);



        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.

        targetIntent.replaceExtras(intent);