diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-23 23:02:05 +0100 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-25 06:50:28 -0700 |
commit | db84e82a0a098c821b7a4f419293770277a24a34 (patch) | |
tree | dd9f8c4aedfe102b435bc97f643e8567fede03fe /src/com/android/launcher3/WallpaperPickerActivity.java | |
parent | b923fb339969c58dc6f6eea51e3e201787126a84 (diff) | |
download | android_packages_apps_Trebuchet-db84e82a0a098c821b7a4f419293770277a24a34.tar.gz android_packages_apps_Trebuchet-db84e82a0a098c821b7a4f419293770277a24a34.tar.bz2 android_packages_apps_Trebuchet-db84e82a0a098c821b7a4f419293770277a24a34.zip |
Add default wallpaper to picker
Bug: 10852485
Change-Id: Idb70cd3bb0901f924da245016f5a8b96ec414470
Diffstat (limited to 'src/com/android/launcher3/WallpaperPickerActivity.java')
-rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 51 |
1 files changed, 44 insertions, 7 deletions
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 5f35cde21..d3c6c1a2a 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -29,11 +29,12 @@ import android.content.res.Resources; import android.database.Cursor; import android.database.DataSetObserver; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LevelListDrawable; import android.net.Uri; @@ -58,6 +59,8 @@ import android.widget.ListAdapter; import com.android.photos.BitmapRegionTileSource; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -462,7 +465,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { new BitmapCropTask(context, res, resId, null, width, height, false, true, null); } Point bounds = cropTask.getImageBounds(); - if (bounds == null) { + if (bounds == null || bounds.x == 0 || bounds.y == 0) { return null; } @@ -546,14 +549,48 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { } catch (PackageManager.NameNotFoundException e) { } } - //TODO: add default wallpaper - //Resources sysRes = Resources.getSystem(); - //int resId = sysRes.getIdentifier("default_wallpaper", "drawable", "android"); - //bundledWallpapers.add( - // new ResourceWallpaperInfo(sysRes, resId, new ColorDrawable(0xFFFF0000))); + + // Add an entry for the default wallpaper (stored in system resources) + ResourceWallpaperInfo defaultWallpaperInfo = getDefaultWallpaperInfo(); + if (defaultWallpaperInfo != null) { + bundledWallpapers.add(0, defaultWallpaperInfo); + } return bundledWallpapers; } + private ResourceWallpaperInfo getDefaultWallpaperInfo() { + Resources sysRes = Resources.getSystem(); + int resId = sysRes.getIdentifier("default_wallpaper", "drawable", "android"); + + File defaultThumbFile = new File(getFilesDir(), "default_thumb.jpg"); + Bitmap thumb = null; + boolean defaultWallpaperExists = false; + if (defaultThumbFile.exists()) { + thumb = BitmapFactory.decodeFile(defaultThumbFile.getAbsolutePath()); + defaultWallpaperExists = true; + } else { + Point defaultThumbSize = getDefaultThumbnailSize(getResources()); + thumb = createThumbnail(defaultThumbSize, this, null, null, sysRes, resId, false); + if (thumb != null) { + try { + defaultThumbFile.createNewFile(); + FileOutputStream thumbFileStream = + openFileOutput(defaultThumbFile.getName(), Context.MODE_PRIVATE); + thumb.compress(Bitmap.CompressFormat.JPEG, 95, thumbFileStream); + thumbFileStream.close(); + defaultWallpaperExists = true; + } catch (IOException e) { + Log.e(TAG, "Error while writing default wallpaper thumbnail to file " + e); + defaultThumbFile.delete(); + } + } + } + if (defaultWallpaperExists) { + return new ResourceWallpaperInfo(sysRes, resId, new BitmapDrawable(thumb)); + } + return null; + } + public Pair<ApplicationInfo, Integer> getWallpaperArrayResourceId() { // Context.getPackageName() may return the "original" package name, // com.android.launcher3; Resources needs the real package name, |