Trebuchet: Change icon labels option strings

Conflicts:
	src/com/android/launcher3/OverviewSettingsPanel.java

Change-Id: I499ec846bf2c7b2dc1c0d39c2c62a2525412335c

2 files changed, 50 insertions, 16 deletions

diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index e104d202a..9fe1d7e06 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -40,15 +40,31 @@ public class OverviewSettingsPanel {
         String[] headers = new String[] {
                 res.getString(R.string.home_screen_settings),
                 res.getString(R.string.drawer_settings)};
-        String[] 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)};
+
+        String[] values;
+        if(mLauncher.isGelIntegrationSupported()) {
+            values = new String[]{
+                    res.getString(R.string.home_screen_search_text),
+                    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.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.icon_labels),
+                    res.getString(R.string.scrolling_wallpaper)};
+        }
+
+        mValues = values;
+
         String[] valuesDrawer = new String[] {
                 res.getString(R.string.scroll_effect_text),
                 res.getString(R.string.drawer_sorting_text),
-                res.getString(R.string.hide_icon_labels),
+                res.getString(R.string.icon_labels),
                 res.getString(R.string.protected_app_settings)};
 
         mSettingsAdapter = new SettingsPinnedHeaderAdapter(mLauncher);
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 22bfb6015..fe0567b33 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -101,15 +101,15 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     R.string.setting_state_off);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else if (title.equals(res
-                .getString(R.string.hide_icon_labels)) &&
+                .getString(R.string.icon_labels)) &&
                 partition == OverviewSettingsPanel.HOME_SETTINGS_POSITION) {
             boolean current = mLauncher.shouldHideWorkspaceIconLables();
             String state = current ? res.getString(
-                    R.string.setting_state_on) : res.getString(
-                    R.string.setting_state_off);
+                    R.string.icon_labels_hide) : res.getString(
+                    R.string.icon_labels_show);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else if (title.equals(res
-                .getString(R.string.hide_icon_labels)) &&
+                .getString(R.string.icon_labels)) &&
                 partition == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION) {
             boolean current = SettingsProvider
                     .getBoolean(
@@ -117,8 +117,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                             SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS,
                             R.bool.preferences_interface_drawer_hide_icon_labels_default);
             String state = current ? res.getString(
-                    R.string.setting_state_on) : res.getString(
-                    R.string.setting_state_off);
+                    R.string.icon_labels_hide) : res.getString(
+                    R.string.icon_labels_show);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else if (title.equals(res
                 .getString(R.string.search_screen_left_text))) {
@@ -232,17 +232,17 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         R.bool.preferences_interface_general_icons_large_default);
                 mLauncher.updateDynamicGrid();
             } else if (value.equals(res
-                    .getString(R.string.hide_icon_labels)) &&
+                    .getString(R.string.icon_labels)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) {
-                onSettingsBooleanChanged(
+                onIconLabelsBooleanChanged(
                         v,
                         SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
                         R.bool.preferences_interface_homescreen_hide_icon_labels_default);
                 mLauncher.updateDynamicGrid();
             } else if (value.equals(res
-                    .getString(R.string.hide_icon_labels)) &&
+                    .getString(R.string.icon_labels)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION)) {
-                onSettingsBooleanChanged(
+                onIconLabelsBooleanChanged(
                         v,
                         SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS,
                         R.bool.preferences_interface_drawer_hide_icon_labels_default);
@@ -304,6 +304,24 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
         ((TextView) v.findViewById(R.id.item_state)).setText(state);
     }
 
+    private void onIconLabelsBooleanChanged(View v, String key, int res) {
+        boolean current = SettingsProvider.getBoolean(
+                mContext, key, res);
+
+        // Set new state
+        SharedPreferences sharedPref = SettingsProvider
+                .get(mContext);
+        sharedPref.edit().putBoolean(key, !current).commit();
+        sharedPref.edit()
+                .putBoolean(SettingsProvider.SETTINGS_CHANGED, true)
+                .commit();
+
+        String state = current ? mLauncher.getResources().getString(
+                R.string.icon_labels_show) : mLauncher.getResources().getString(
+                R.string.icon_labels_hide);
+        ((TextView) v.findViewById(R.id.item_state)).setText(state);
+    }
+
     private void onClickTransitionEffectButton() {
         int sort = SettingsProvider.getIntCustomDefault(mLauncher,
                 SettingsProvider.SETTINGS_UI_DRAWER_SORT_MODE, 0);