Make sure SubsamplingScaleImageView respects minimum scale
Fixes: 158733183
Test: manual
Change-Id: I18b8fd453a0ab94370427f6da8dac9e2d86c96c2
diff --git a/src/com/android/wallpaper/picker/ImagePreviewFragment.java b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
index a469bd1..cbf724b 100755
--- a/src/com/android/wallpaper/picker/ImagePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
@@ -267,7 +267,11 @@
*/
private void initFullResView() {
setEditingEnabled(false);
- mFullResImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
+ // Minimum scale will only be respected under this scale type.
+ mFullResImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CUSTOM);
+ // When we set a minimum scale bigger than the scale with which the full image is shown,
+ // disallow user to pan outside the view we show the wallpaper in.
+ mFullResImageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE);
// Set a solid black "page bitmap" so MosaicView draws a black background while waiting
// for the image to load or a transparent one if a thumbnail already loaded.
