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

Commit 5dd32fbc authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #4499996: LiveWallpaperPreview activity intent filter"

parents bac7ef0b 7df7d202

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -4069,10 +4069,12 @@ package android.app { 
    method public void setWallpaperOffsetSteps(float, float);

    method public void setWallpaperOffsets(android.os.IBinder, float, float);

    method public void suggestDesiredDimensions(int, int);

    field public static final java.lang.String ACTION_CHANGE_LIVE_WALLPAPER = "android.service.wallpaper.CHANGE_LIVE_WALLPAPER";

    field public static final java.lang.String ACTION_LIVE_WALLPAPER_CHOOSER = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";

    field public static final java.lang.String COMMAND_DROP = "android.home.drop";

    field public static final java.lang.String COMMAND_SECONDARY_TAP = "android.wallpaper.secondaryTap";

    field public static final java.lang.String COMMAND_TAP = "android.wallpaper.tap";

    field public static final java.lang.String EXTRA_LIVE_WALLPAPER_COMPONENT = "android.service.wallpaper.extra.LIVE_WALLPAPER_COMPONENT";

    field public static final java.lang.String WALLPAPER_PREVIEW_META_DATA = "android.wallpaper.preview";

  }

























cmds/am/src/com/android/commands/am/Am.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -194,6 +194,12 @@ public class Am {













                String key = nextArgRequired();















                String value = nextArgRequired();















                intent.putExtra(key, Uri.parse(value));













            } else if (opt.equals("--ecn")) {













                String key = nextArgRequired();













                String value = nextArgRequired();













                ComponentName cn = ComponentName.unflattenFromString(value);













                if (cn == null) throw new IllegalArgumentException("Bad component name: " + value);













                intent.putExtra(key, cn);















            } else if (opt.equals("--eia")) {















                String key = nextArgRequired();















                String value = nextArgRequired();










@@ -1366,6 +1372,7 @@ public class Am {













                "    [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]\n" +















                "    [--ef <EXTRA_KEY> <EXTRA_FLOAT_VALUE> ...]\n" +















                "    [--eu <EXTRA_KEY> <EXTRA_URI_VALUE> ...]\n" +













                "    [--ecn <EXTRA_KEY> <EXTRA_COMPONENT_NAME_VALUE>]\n" +















                "    [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]\n" +















                "    [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +















                "    [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]\n" +

































core/java/android/app/WallpaperManager.java



+17
−0




























Original line number
Diff line number
Diff line








@@ -66,6 +66,23 @@ public class WallpaperManager {













    public static final String ACTION_LIVE_WALLPAPER_CHOOSER















            = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";





























    /**













     * Directly launch live wallpaper preview, allowing the user to immediately













     * confirm to switch to a specific live wallpaper.  You must specify













     * {@link #EXTRA_LIVE_WALLPAPER_COMPONENT} with the ComponentName of













     * a live wallpaper component that is to be shown.













     */













    public static final String ACTION_CHANGE_LIVE_WALLPAPER













            = "android.service.wallpaper.CHANGE_LIVE_WALLPAPER";



























    /**













     * Extra in {@link #ACTION_CHANGE_LIVE_WALLPAPER} that specifies the













     * ComponentName of a live wallpaper that should be shown as a preview,













     * for the user to confirm.













     */













    public static final String EXTRA_LIVE_WALLPAPER_COMPONENT













            = "android.service.wallpaper.extra.LIVE_WALLPAPER_COMPONENT";





























    /**















     * Manifest entry for activities that respond to {@link Intent#ACTION_SET_WALLPAPER}















     * which allows them to provide a custom large icon associated with this action.