Fixing merge into ub-launcher3-master

Change-Id: Ifd9128c72f6e11855b1bb9272c6f193d688ba021

diff --cc WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index b562fbf,b717b59..4be6f17
--- 1/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
--- 2/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@@ -338,9 -358,12 +338,12 @@@ public class WallpaperCropActivity exte
      }
  
      @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 -    protected void cropImageAndSetWallpaper(Uri uri,
 +    public void cropImageAndSetWallpaper(Uri uri,
              BitmapCropTask.OnBitmapCroppedHandler onBitmapCroppedHandler,
 -            final boolean finishActivityWhenDone, final boolean shouldFadeOutOnFinish) {
 +            boolean shouldFadeOutOnFinish) {
+         // Give some feedback so user knows something is happening.
+         mProgressView.setVisibility(View.VISIBLE);
+ 
          boolean centerCrop = getResources().getBoolean(R.bool.center_crop);
          // Get the crop
          boolean ltr = mCropView.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR;