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

Commit 892574f5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 13bf8260: Fix SDK build: a few things missing, a link that was wrong. 

Merge commit '13bf8260' into eclair-mr2

* commit '13bf8260':
  Fix SDK build: a few things missing, a link that was wrong.
parents 237cc15c 13bf8260

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public abstract class WallpaperService extends Service { 
        

        /**

         * Process a command that was sent to the wallpaper with

         * {@link WallpaperManager#sendWallpaperCommand(String, int, int, int, Bundle)}.

         * {@link WallpaperManager#sendWallpaperCommand}.

         * The default implementation does nothing, and always returns null

         * as the result.

         *

core/res/res/values/attrs.xml

+1 −2
Original line number Diff line number Diff line
@@ -3474,8 +3474,7 @@ 
         referenced from its

         {@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA}

         meta-data entry.  Described here are the attributes that can be

         included in that tag.

         @hide Live Wallpaper -->

         included in that tag. -->

    <declare-styleable name="Wallpaper">

        <!-- Component name of an activity that allows the user to modify

             the current settings for this wallpaper. -->