commit a98e2105027ed494af5b969faa400cf1bf504343
author Tony Wickham <twickham@google.com> Wed Oct 21 14:41:25 2015 -0700
committer Tony Wickham <twickham@google.com> Wed Oct 21 14:41:25 2015 -0700
tree cb3f79eb6a5accb676ef1cacdee3b373f63242be
parent 6f0f35806f860b9e4a4513ac219e2c5cd1ee56cd
parent d5d7fa10af06518c055d0ce3199c6b65fd21429b

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

Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243

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

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index 4be6f17..3554ca7 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -108,6 +108,7 @@
                 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 */);