From 7372001d136e84d4deaf7d1abd0b96ab8902f430 Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Fri, 13 Jun 2014 14:00:09 -0700
Subject: Move Scrolling Wallpaper to new Trebuchet Settings

Change-Id: I57961ae9b6f0df334ddd2c4563ddfd7e2939f01e
---
 res/values/cm_strings.xml                               |  3 +++
 src/com/android/launcher3/OverviewSettingsPanel.java    |  6 ++++--
 src/com/android/launcher3/Workspace.java                | 10 ++++++++++
 .../launcher3/list/SettingsPinnedHeaderAdapter.java     | 17 +++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 5681a769d..854db56ff 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -114,7 +114,10 @@
     <!-- Settings states -->
     <string name="setting_state_on">ON</string>
     <string name="setting_state_off">OFF</string>
+    <!-- Themes button -->
     <string name="themes_button_text">Themes</string>
+    <!-- Wallpaper scroll effect -->
+    <string name="scrolling_wallpaper">Scroll wallpaper</string>
 
     <!-- Hidden states -->
     <string name="hidden_folder">locked</string>
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index e3fbfa3ed..614f94e1d 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -49,13 +49,15 @@ public class OverviewSettingsPanel {
                     res.getString(R.string.search_screen_left_text),
                     res.getString(R.string.scroll_effect_text),
                     res.getString(R.string.larger_icons_text),
-                    res.getString(R.string.hide_icon_labels)};
+                    res.getString(R.string.hide_icon_labels),
+                    res.getString(R.string.scrolling_wallpaper)};
         } else {
             values = new String[]{
                     res.getString(R.string.home_screen_search_text),
                     res.getString(R.string.scroll_effect_text),
                     res.getString(R.string.larger_icons_text),
-                    res.getString(R.string.hide_icon_labels)};
+                    res.getString(R.string.hide_icon_labels),
+                    res.getString(R.string.scrolling_wallpaper)};
         }
 
         mValues = values;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a5a1f5460..f3dee8dc2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4933,6 +4933,16 @@ public class Workspace extends SmoothPagedView
         TransitionEffect.setFromString(this, SettingsProvider.getString(mLauncher,
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT,
                 R.string.preferences_interface_homescreen_scrolling_transition_effect));
+
+        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();
+        }
     }
 
     public boolean getShowSearchBar() {
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index c4cd88a22..3978b0ea7 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -131,6 +131,16 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     R.string.setting_state_on) : res.getString(
                     R.string.setting_state_off);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
+        } else if (title.equals(res.getString(R.string.scrolling_wallpaper))) {
+            boolean current = SettingsProvider
+                    .getBoolean(
+                            mContext,
+                            SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
+                            R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
+            String state = current ? res.getString(
+                    R.string.setting_state_on) : res.getString(
+                    R.string.setting_state_off);
+            ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else {
             ((TextView) v.findViewById(R.id.item_state)).setText("");
         }
@@ -242,6 +252,13 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 intent.setClassName(OverviewSettingsPanel.ANDROID_SETTINGS,
                         OverviewSettingsPanel.ANDROID_PROTECTED_APPS);
                 mLauncher.startActivity(intent);
+            } else if (value.equals(res
+                    .getString(R.string.scrolling_wallpaper))) {
+                onSettingsBooleanChanged(
+                        v,
+                        SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
+                        R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
+                mLauncher.updateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.search_screen_left_text)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) {
-- 
cgit v1.2.3