An option to disable wallpaper scrolling.

Change trash can icon in launcher.
SalvageMod · May 9, 2011 · 9f8d05e · 9f8d05e
1 parent 8f7cb74
commit 9f8d05e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png
diff --git a/res/drawable-hdpi/trashcan_hover.png b/res/drawable-hdpi/trashcan_hover.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -160,8 +160,8 @@
     <string name="pref_summary_hide_labels">Check to hide desktop icon labels</string>
     <string name="pref_title_hide_labels">Hide labels</string>
     <string name="pref_summary_launcher_fullscreen">Hide notification bar on homescreen</string>
-    <string name="pref_title_launcher_fullscreen">Full screen launcher</string>
-
-
+    <string name="pref_title_launcher_fullscreen">Full screen mode</string>
+    <string name="pref_title_wallpaper_scrolling">Wallpaper scrolling</string>
+    <string name="pref_summary_wallpaper_scrolling">Enable/disable wallpaper scroll</string>
 
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -9,6 +9,11 @@
        android:summary="@string/pref_summary_launcher_fullscreen"
        android:defaultValue="false" />
 
+    <CheckBoxPreference android:key="pref_key_launcher_wallpaper_scrolling"
+                        android:title="@string/pref_title_wallpaper_scrolling"
+                        android:summary="@string/pref_summary_wallpaper_scrolling"
+                        android:defaultValue="true" />
+
     </PreferenceCategory>
 
     <PreferenceCategory 

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
@@ -599,6 +599,9 @@ protected void onResume() {
 		} else {
 			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
+
+        Workspace.WALLPAPER_SCROLLING = mPrefs.getBoolean(LauncherPreferenceActivity.LAUNCHER_WALLPAPER_SCROLLING, true);
+
         if (mRestoring || mOnResumeNeedsLoad) {
             mWorkspaceLoading = true;
             mModel.startLoader(this, true);

diff --git a/src/com/android/launcher2/LauncherPreferenceActivity.java b/src/com/android/launcher2/LauncherPreferenceActivity.java
@@ -41,6 +41,7 @@ public class LauncherPreferenceActivity extends PreferenceActivity{
     public static final String LAUNCHER_HIDE_LABELS = "pref_key_launcher_hide_labels";
     public static final String LAUNCHER_SHOW_SHORTCUTS_LABEL = "pref_key_launcher_show_shortcuts_label";
     public static final String LAUNCHER_FULLSCREEN = "pref_key_launcher_fullscreen";
+    public static final String LAUNCHER_WALLPAPER_SCROLLING = "pref_key_launcher_wallpaper_scrolling";
 
    //private static final String APPS2D_PREF = "pref_key_2d_setting";
 

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
@@ -72,6 +72,8 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
 
     private boolean mFirstLayout = true;
 
+    static public boolean WALLPAPER_SCROLLING = true;
+
     private int mCurrentScreen;
     private int mNextScreen = INVALID_SCREEN;
     private CustomScroller mScroller;
@@ -427,11 +429,9 @@ private void updateWallpaperOffset() {
     }
 
     private void updateWallpaperOffset(int scrollRange) {
-        IBinder token = getWindowToken();
-        if (token != null) {
-            mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0 );
-            mWallpaperManager.setWallpaperOffsets(getWindowToken(),
-                    Math.max(0.f, Math.min(mScrollX/(float)scrollRange, 1.f)), 0);
+    	if (Workspace.WALLPAPER_SCROLLING == true) {
+    		mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0 );
+        	mWallpaperManager.setWallpaperOffsets(getWindowToken(), getScrollX() / (float) scrollRange, 0);
         }
     }