diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-21 14:41:25 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-10-21 14:41:25 -0700 |
| commit | a98e2105027ed494af5b969faa400cf1bf504343 (patch) | |
| tree | cb3f79eb6a5accb676ef1cacdee3b373f63242be | |
| parent | 6f0f35806f860b9e4a4513ac219e2c5cd1ee56cd (diff) | |
| parent | d5d7fa10af06518c055d0ce3199c6b65fd21429b (diff) | |
| download | android_packages_apps_Trebuchet-a98e2105027ed494af5b969faa400cf1bf504343.tar.gz android_packages_apps_Trebuchet-a98e2105027ed494af5b969faa400cf1bf504343.tar.bz2 android_packages_apps_Trebuchet-a98e2105027ed494af5b969faa400cf1bf504343.zip | |
resolve merge conflicts of d5d7fa10af to ub-launcher3-master.
Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243
| -rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index 4be6f17ac..3554ca79e 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -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 */); |