WallpaperPickerActivity: Move wallpaper scroll preference to menu

Change-Id: I734260cb0c2f86ebe9d5dbbe7367520e9760008f

5 files changed, 52 insertions, 11 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 50b8bad73..028426970 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -19,6 +19,9 @@
     <string name="sort_mode_launch_count">Launch Count</string>
     <string name="sort_mode_install_time">Install Time</string>
 
+
+    <string name="wallpaper_scroll">Scroll wallpaper</string>
+
     <!-- Settings -->
     <string name="preferences_title">Settings</string>
     <!-- UI -->
@@ -33,8 +36,6 @@
     <string name="preferences_interface_homescreen_search_title">Search bar</string>
     <string name="preferences_interface_homescreen_search_summary">Show persistent search bar at top of screen</string>
     <string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
-    <string name="preferences_interface_homescreen_scrolling_wallpaper_scroll_title">Scroll wallpaper</string>
-    <string name="preferences_interface_homescreen_scrolling_wallpaper_scroll_summary">Pan wallpaper while scrolling homescreens</string>
     <string name="preferences_interface_homescreen_scrolling_page_outlines_title">Page outlines</string>
     <string name="preferences_interface_homescreen_scrolling_page_outlines_summary">Show page outlines while scrolling homescreens</string>
 
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 41ad848a3..438611808 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -23,10 +23,6 @@
             android:summary="@string/preferences_interface_homescreen_search_summary"
             android:defaultValue="@bool/preferences_interface_homescreen_search_default" />
     <PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category">
-        <CheckBoxPreference android:key="ui_homescreen_scrolling_wallpaper_scroll"
-                android:title="@string/preferences_interface_homescreen_scrolling_wallpaper_scroll_title"
-                android:summary="@string/preferences_interface_homescreen_scrolling_wallpaper_scroll_summary"
-                android:defaultValue="@bool/preferences_interface_homescreen_scrolling_wallpaper_scroll_default" />
         <CheckBoxPreference android:key="ui_homescreen_scrolling_page_outlines"
                 android:title="@string/preferences_interface_homescreen_scrolling_page_outlines_title"
                 android:summary="@string/preferences_interface_homescreen_scrolling_page_outlines_summary"
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index e71a26be1..de540f899 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -66,6 +66,7 @@ import android.widget.ListAdapter;
 
 import com.android.gallery3d.exif.ExifInterface;
 import com.android.photos.BitmapRegionTileSource;
+import org.cyanogenmod.trebuchet.settings.SettingsProvider;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -82,6 +83,9 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
     public static final int PICK_LIVE_WALLPAPER = 7;
     private static final String TEMP_WALLPAPER_TILES = "TEMP_WALLPAPER_TILES";
 
+    private static final int MENU_WALLPAPER_SCROLL = 0;
+
+
     private View mSelectedThumb;
     private boolean mIgnoreNextTap;
     private OnClickListener mThumbnailOnClickListener;
@@ -499,6 +503,39 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         return thumb;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add(0, MENU_WALLPAPER_SCROLL, 0,
+                R.string.wallpaper_scroll).setCheckable(true);
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem wallpaperScroll = menu.findItem(MENU_WALLPAPER_SCROLL);
+
+        wallpaperScroll.setChecked(SettingsProvider.getBoolean(this,
+                SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
+                R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default));
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle presses on the action bar items
+        switch (item.getItemId()) {
+            case MENU_WALLPAPER_SCROLL:
+                SettingsProvider.get(this).edit()
+                        .putBoolean(SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL, !item.isChecked())
+                        .commit();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     protected void onStop() {
         super.onStop();
         mWallpaperStrip = findViewById(R.id.wallpaper_strip);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ebe2e9af0..087d6d85f 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -313,9 +313,6 @@ public class Workspace extends SmoothPagedView
         mShowOutlines = SettingsProvider.getBoolean(context,
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES,
                 R.bool.preferences_interface_homescreen_scrolling_page_outlines_default);
-        mScrollWallpaper = SettingsProvider.getBoolean(context,
-                SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
-                R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
         TransitionEffect.setFromString(this, SettingsProvider.getString(context,
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT,
                 R.string.preferences_interface_homescreen_scrolling_transition_effect));
@@ -448,7 +445,7 @@ public class Workspace extends SmoothPagedView
             // In this case, we will skip drawing background protection
         }
 
-        if (mScrollWallpaper) mWallpaperOffset = new WallpaperOffsetInterpolator();
+        mWallpaperOffset = new WallpaperOffsetInterpolator();
         Display display = mLauncher.getWindowManager().getDefaultDisplay();
         display.getSize(mDisplaySize);
 
@@ -1605,6 +1602,16 @@ public class Workspace extends SmoothPagedView
         AccessibilityManager am = (AccessibilityManager)
                 getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
         sAccessibilityEnabled = am.isEnabled();
+
+        mScrollWallpaper = SettingsProvider.getBoolean(mLauncher,
+                SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
+                R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
+
+        if (!mScrollWallpaper) {
+            if (mWindowToken != null) mWallpaperManager.setWallpaperOffsets(mWindowToken, 0f, 0.5f);
+        } else {
+            mWallpaperOffset.syncWithScroll();
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java
index fb4c75056..472124684 100644
--- a/src/com/android/launcher3/settings/SettingsProvider.java
+++ b/src/com/android/launcher3/settings/SettingsProvider.java
@@ -35,7 +35,7 @@ public final class SettingsProvider {
     public static final String SETTINGS_UI_GENERAL_ICONS_TEXT_FONT_STYLE = "ui_general_icons_text_font_style";
 
     public static SharedPreferences get(Context context) {
-        return context.getSharedPreferences(SETTINGS_KEY, 0);
+        return context.getSharedPreferences(SETTINGS_KEY, Context.MODE_MULTI_PROCESS);
     }
 
     public static int getIntCustomDefault(Context context, String key, int def) {