Merge "Use the largest display size when calculating wallpaper crop size" into sc-v2-dev
diff --git a/res/drawable/ic_slideshow_24dp.xml b/res/drawable/ic_slideshow_24dp.xml
index f7c0815..291f4cd 100644
--- a/res/drawable/ic_slideshow_24dp.xml
+++ b/res/drawable/ic_slideshow_24dp.xml
@@ -5,23 +5,17 @@
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
- android:pathData="M4,6H2V20a2,2 0,0 0,2 2H18V20H4Z"/>
+ android:pathData="M14,9h-4c-1.1,0 -2,0.9 -2,2l0,4c0,1.1 0.9,2 2,2h4c1.1,0 2,-0.9 2,-2l0,-4C16,9.9 15.1,9 14,9zM9,15l1.5,-1.92l1,1.31L13,12.6l2,2.4H9z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M20,2H15V4h5V9h2V4A2,2 0,0 0,20 2Z"/>
+ android:pathData="M11.5,7.5L15,4l-3.5,-3.5l-1.41,1.42l1.09,1.09C11.12,3.01 11.06,3 11,3v0.05C5.95,3.55 2,7.81 2,13c0,4.76 3.33,8.75 7.79,9.75l0.44,-1.95C6.67,19.99 4,16.8 4,13c0,-4.12 3.13,-7.52 7.13,-7.95l-1.04,1.04L11.5,7.5z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M8,4h5V2H8A2,2 0,0 0,6 4V9H8Z"/>
+ android:pathData="M13.79,20.8l0.45,1.95c1.45,-0.33 2.84,-1 4.01,-1.93l-1.25,-1.56C16.06,20 14.95,20.53 13.79,20.8z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M8,18h5V16H8V11H6v5A2,2 0,0 0,8 18Z"/>
+ android:pathData="M20,13c0,1.21 -0.27,2.38 -0.79,3.47l1.8,0.87C21.66,15.99 22,14.54 22,13H20z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M20,16H15v2h5a2,2 0,0 0,2 -2V11H20Z"/>
- <path
- android:fillColor="#FF000000"
- android:pathData="M13.28,13.01l-1.78,-2.01l-2.5,3l10,0l-3.22,-4l-2.5,3.01z"/>
- <path
- android:fillColor="#FF000000"
- android:pathData="M17,7m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
+ android:pathData="M18.21,5.16l-1.24,1.57c0.94,0.74 1.71,1.7 2.23,2.78L21,8.63C20.34,7.29 19.38,6.09 18.21,5.16z"/>
</vector>
diff --git a/src/com/android/wallpaper/picker/ImagePreviewFragment.java b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
index 87c3101..2a70325 100755
--- a/src/com/android/wallpaper/picker/ImagePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
@@ -289,8 +289,9 @@
* Initializes MosaicView by initializing tiling, setting a fallback page bitmap, and
* initializing a zoom-scroll observer and click listener.
*/
- private void initFullResView() {
- if (mRawWallpaperSize == null || mFullResImageView == null) {
+ private synchronized void initFullResView() {
+ if (mRawWallpaperSize == null || mFullResImageView == null
+ || mFullResImageView.isImageLoaded()) {
return;
}