diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-04-16 09:41:58 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2014-04-28 08:54:17 -0700 |
commit | 28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5 (patch) | |
tree | 715d463e05f8f558335a9919e038334d51460a6d /services | |
parent | bdd4491b322bebd96b99da508ec7b0b7d59d97ae (diff) | |
download | frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.zip frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.tar.gz frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.tar.bz2 |
Allow custom wallpaper and boot animation.
Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources. Falls back to bundled resources when properties are
undefined.
Also look for boot animation under OEM partition.
Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 87953fe..3eb2d5f 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -25,6 +25,7 @@ import android.app.IWallpaperManager; import android.app.IWallpaperManagerCallback; import android.app.PendingIntent; import android.app.WallpaperInfo; +import android.app.WallpaperManager; import android.app.backup.BackupManager; import android.app.backup.WallpaperBackupHelper; import android.content.BroadcastReceiver; @@ -844,13 +845,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { try { if (componentName == null) { - String defaultComponent = - mContext.getString(com.android.internal.R.string.default_wallpaper_component); - if (defaultComponent != null) { - // See if there is a default wallpaper component specified - componentName = ComponentName.unflattenFromString(defaultComponent); - if (DEBUG) Slog.v(TAG, "Use default component wallpaper:" + componentName); - } + componentName = WallpaperManager.getDefaultWallpaperComponent(mContext); if (componentName == null) { // Fall back to static image wallpaper componentName = IMAGE_WALLPAPER; |