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

Commit 08758fad authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am ab1f2a82: am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1

* commit 'ab1f2a82':
  Broaden the filter for wallpaper restore
parents 9ebdd664 ab1f2a82
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -110,11 +110,16 @@ public class WallpaperBackupHelper extends FileBackupHelperBase implements Backu
                    if (DEBUG) Slog.d(TAG, "Restoring wallpaper image w=" + options.outWidth
                            + " h=" + options.outHeight);

                    // how much does the image differ from our preference?
                    // How much does the image differ from our preference?  The threshold
                    // here is set to accept any image larger than our target, because
                    // scaling down is acceptable; but to reject images that are deemed
                    // "too small" to scale up attractively.  The value 1.33 is just barely
                    // too low to pass Nexus 1 or Droid wallpapers for use on a Xoom, but
                    // will pass anything relatively larger.
                    double widthRatio = mDesiredMinWidth / options.outWidth;
                    double heightRatio = mDesiredMinHeight / options.outHeight;
                    if (widthRatio > 0.8 && widthRatio < 1.25
                            && heightRatio > 0.8 && heightRatio < 1.25) {
                    if (widthRatio > 0 && widthRatio < 1.33
                            && heightRatio > 0 && heightRatio < 1.33) {
                        // sufficiently close to our resolution; go ahead and use it
                        if (DEBUG) Slog.d(TAG, "wallpaper dimension match; using");
                        f.renameTo(new File(WALLPAPER_IMAGE));