Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp

* commit '892574f5f91b834f70ace880301db61f60d58362':
  Fix SDK build: a few things missing, a link that was wrong.
This commit is contained in:
Dianne Hackborn
2009-11-05 22:02:56 -08:00
committed by Android Git Automerger
parent 85fdfd0144 892574f5f9
commit 78e502df51
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -365,7 +365,7 @@ public abstract class WallpaperService extends Service {
/** /**
* Process a command that was sent to the wallpaper with * 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 * The default implementation does nothing, and always returns null
* as the result. * as the result.
* *

3
core/res/res/values/attrs.xml
View File

@@ -3474,8 +3474,7 @@
referenced from its referenced from its
{@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA} {@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA}
meta-data entry. Described here are the attributes that can be meta-data entry. Described here are the attributes that can be
included in that tag. included in that tag. -->
@hide Live Wallpaper -->
<declare-styleable name="Wallpaper"> <declare-styleable name="Wallpaper">
<!-- Component name of an activity that allows the user to modify <!-- Component name of an activity that allows the user to modify
the current settings for this wallpaper. --> the current settings for this wallpaper. -->