summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2014-06-13 23:15:18 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-06-13 23:15:18 +0000
commit7fb166a65c92d9cd7d375937321bde723b4b6669 (patch)
tree9bfd2c8467ce1885cb717960effe4087258b7688 /src
parent087502d2d3ff3a638e59d9873930a7e0c553ff66 (diff)
parent7372001d136e84d4deaf7d1abd0b96ab8902f430 (diff)
downloadandroid_packages_apps_Trebuchet-7fb166a65c92d9cd7d375937321bde723b4b6669.tar.gz
android_packages_apps_Trebuchet-7fb166a65c92d9cd7d375937321bde723b4b6669.tar.bz2
android_packages_apps_Trebuchet-7fb166a65c92d9cd7d375937321bde723b4b6669.zip
Merge "Move Scrolling Wallpaper to new Trebuchet Settings" into cm-11.0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java6
-rw-r--r--src/com/android/launcher3/Workspace.java10
-rw-r--r--src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java17
3 files changed, 31 insertions, 2 deletions
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("");
}
@@ -243,6 +253,13 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
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)) {