summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-02-28 14:52:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-28 14:52:44 +0000
commit4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373 (patch)
treeb6b49b53d7f95c8a21066a4d5b09debd65c1eb63
parent7114426665c21a11464147a8bb5e094b7949db42 (diff)
parentb45b65e1e532e4fbe6b5d565bd18a292a2df978d (diff)
downloadandroid_packages_apps_Trebuchet-4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373.tar.gz
android_packages_apps_Trebuchet-4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373.tar.bz2
android_packages_apps_Trebuchet-4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373.zip
Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c87f9e2f0..1060a94c2 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2887,7 +2887,7 @@ public class Launcher extends Activity
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;