commit ca1d129cc7f0307b9d7d52498b62a2eb79cb1c5b
author Chuck Liao <chuckliao@google.com> Fri Jun 19 01:29:53 2020 +0800
committer Chuck Liao <chuckliao@google.com> Fri Jun 19 10:55:44 2020 +0800
tree 04715efe2a8488f07206df9d63cf650e54f49ed8
parent 97598457dfe0bdd3f21ffa885a0a0322d9ca7014

Make sure mLowResImageView is used after initializing.

There's a chance that mLowResImageView is used before initializing.

Bug: 159300012
Change-Id: Icdf7e4556bd0578e5efea1c6aac5956614ade691

src/com/android/wallpaper/picker/ImagePreviewFragment.java

diff --git a/src/com/android/wallpaper/picker/ImagePreviewFragment.java b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
index dfa28d6..566cbaa 100755
--- a/src/com/android/wallpaper/picker/ImagePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
@@ -169,15 +169,6 @@
         mDefaultCropSurfaceSize = WallpaperCropUtils.getDefaultCropSurfaceSize(
                 getResources(), activity.getWindowManager().getDefaultDisplay());
 
-        // Load a low-res placeholder image if there's a thumbnail available from the asset that can
-        // be shown to the user more quickly than the full-sized image.
-        if (mWallpaperAsset.hasLowResDataSource()) {
-            mHandler.post(() ->
-                    mWallpaperAsset.loadLowResDrawable(activity, mLowResImageView, Color.BLACK,
-                            new WallpaperPreviewBitmapTransformation(
-                                    activity.getApplicationContext(), isRtl())));
-        }
-
         mBottomActionBar.disableActions();
         mWallpaperAsset.decodeRawDimensions(getActivity(), dimensions -> {
             if (mBottomActionBar != null) {
@@ -449,6 +440,14 @@
                         R.layout.fullscreen_wallpaper_preview, null);
                 mFullResImageView = wallpaperPreviewContainer.findViewById(R.id.full_res_image);
                 mLowResImageView = wallpaperPreviewContainer.findViewById(R.id.low_res_image);
+                // Load a low-res placeholder image if there's a thumbnail available from the asset
+                // that can be shown to the user more quickly than the full-sized image.
+                if (mWallpaperAsset.hasLowResDataSource()) {
+                    Activity activity = requireActivity();
+                    mWallpaperAsset.loadLowResDrawable(activity, mLowResImageView, Color.BLACK,
+                            new WallpaperPreviewBitmapTransformation(
+                                    activity.getApplicationContext(), isRtl()));
+                }
                 wallpaperPreviewContainer.measure(
                         makeMeasureSpec(mWallpaperSurface.getWidth(), EXACTLY),
                         makeMeasureSpec(mWallpaperSurface.getHeight(), EXACTLY));