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

Commit fe0d4a56 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Update java doc of ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY" into... 

Merge "Update java doc of ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY" into tm-qpr-dev am: 30b00859 am: 92af24c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20427787



Change-Id: I67d430e6f773e15cf26b3307fb53418a558d2029
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84359ed4 92af24c6

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -18674,6 +18674,9 @@ public final class Settings { 
    /**

     * Activity Action: For system or preinstalled apps to show their {@link Activity} embedded

     * in Settings app on large screen devices.

     *

     * Developers should resolve the Intent action before using it.

     *

     * <p>

     *     Input: {@link #EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI} must be included to

     * specify the intent for the activity which will be embedded in Settings app.