commit feec09d731782ca2e8b0fe9d59192fbc43f56e6c
author Anjali Koppal <akoppal@google.com> Fri Feb 28 22:32:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 22:32:06 2014 +0000
tree 68e072b742650b02ac5115e0c2758c5817d13afe
parent ddace3187d9792590d8b64de198f088541ab68f7
parent f5d29130b9f4c501502272d6a97e4c7fb20d95f4

Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly

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

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 80c649a..3f3dca8 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -257,6 +257,7 @@
         public void onSave(WallpaperPickerActivity a) {
             try {
                 WallpaperManager.getInstance(a).clear();
+                a.setResult(RESULT_OK);
             } catch (IOException e) {
                 Log.w("Setting wallpaper to default threw exception", e);
             }

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c614942..7ffb728 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2923,7 +2923,7 @@
                 mWorkspaceBackgroundDrawable : null);
     }
 
-    protected void changeWallpaperVisiblity(boolean visible) {
+    void updateWallpaperVisibility(boolean visible) {
         int wpflags = visible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0;
         int curflags = getWindow().getAttributes().flags
                 & WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;