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

Commit a98e2105 authored by Tony Wickham's avatar Tony Wickham
Browse files

resolve merge conflicts of d5d7fa10 to ub-launcher3-master. 

Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243
parents 6f0f3580 d5d7fa10

WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class WallpaperCropActivity extends BaseActivity implements Handler.Callb 
                new View.OnClickListener() {

                    @Override

                    public void onClick(View v) {

                        actionBar.hide();

                        // Never fade on finish because we return to the app that started us (e.g.

                        // Photos), not the home screen.

                        cropImageAndSetWallpaper(imageUri, null, false /* shouldFadeOutOnFinish */);