From c2e0e2b87255a1fb002eadf7735e99614b7de656 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Mon, 10 Nov 2014 10:35:00 -0800
Subject: Trebuchet: Remove duplicate string

Change-Id: I5a1ed314ca05eb4771038c0e08c4695ed51b3f92
---
 res/values/cm_strings.xml                                       | 6 ++----
 src/com/android/launcher3/OverviewSettingsPanel.java            | 6 +++---
 src/com/android/launcher3/TransitionEffectsFragment.java        | 6 ++----
 src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 8 ++++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 267d65a18..2fe669727 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -104,10 +104,8 @@
     <string name="launcher_settings">LAUNCHER SETTINGS</string>
     <string name="home_screen_settings">HOME SCREEN SETTINGS</string>
     <string name="drawer_settings">DRAWER SETTINGS</string>
-    <!-- Text for page scroll -->
-    <string name="page_scroll_effect_text">Scroll effect</string>
-    <!-- Text for drawer scroll -->
-    <string name="drawer_scroll_effect_text">Scroll effect</string>
+    <!-- Text for scroll effect -->
+    <string name="scroll_effect_text">Scroll effect</string>
     <!-- Text for drawer sorting -->
     <string name="drawer_sorting_text">Sorting mode</string>
     <!-- Text for home screen search -->
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 76faff033..dad2a503c 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -37,11 +37,11 @@ public class OverviewSettingsPanel {
                 res.getString(R.string.drawer_settings)};
         String[] values = new String[] {
                 res.getString(R.string.home_screen_search_text),
-                res.getString(R.string.page_scroll_effect_text),
+                res.getString(R.string.scroll_effect_text),
                 res.getString(R.string.larger_icons_text),
                 res.getString(R.string.hide_icon_labels)};
         String[] valuesDrawer = new String[] {
-                res.getString(R.string.drawer_scroll_effect_text),
+                res.getString(R.string.scroll_effect_text),
                 res.getString(R.string.drawer_sorting_text),
                 res.getString(R.string.hide_icon_labels)};
 
@@ -149,7 +149,7 @@ public class OverviewSettingsPanel {
         } else {
             String[] values = new String[] {
                     res.getString(R.string.home_screen_search_text),
-                    res.getString(R.string.page_scroll_effect_text),
+                    res.getString(R.string.scroll_effect_text),
                     res.getString(R.string.larger_icons_text),
                     res.getString(R.string.hide_icon_labels)};
             mSettingsAdapter.changeCursor(0, createCursor(res
diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java
index 69231a8f0..88c6481d7 100644
--- a/src/com/android/launcher3/TransitionEffectsFragment.java
+++ b/src/com/android/launcher3/TransitionEffectsFragment.java
@@ -89,9 +89,7 @@ public class TransitionEffectsFragment extends Fragment {
         mListView = (ListView) v.findViewById(R.id.settings_transitions_list);
         mScrollView = (ScrollView) v.findViewById(R.id.scroll_view);
         TextView title = (TextView) v.findViewById(R.id.transition_effect_title);
-        title.setText(mPageOrDrawer ? getResources().getString(
-                R.string.drawer_scroll_effect_text) : getResources().getString(
-                R.string.page_scroll_effect_text));
+        title.setText(getResources().getString(R.string.scroll_effect_text));
         LinearLayout titleLayout = (LinearLayout) v.findViewById(R.id.transition_title);
         titleLayout.setOnClickListener(new OnClickListener() {
             @Override
@@ -219,4 +217,4 @@ public class TransitionEffectsFragment extends Fragment {
             return convertView;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 1b6316293..43d98c33e 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -75,13 +75,13 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 .getString(R.string.drawer_sorting_text))) {
             updateDrawerSortSettingsItem(v);
         } else if (title.equals(res
-                .getString(R.string.drawer_scroll_effect_text)) &&
+                .getString(R.string.scroll_effect_text)) &&
                 partition == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION) {
             String state = mLauncher.getAppsCustomizeTransitionEffect();
             state = mapEffectToValue(state);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else if (title.equals(res
-                .getString(R.string.page_scroll_effect_text)) &&
+                .getString(R.string.scroll_effect_text)) &&
                 partition == OverviewSettingsPanel.HOME_SETTINGS_POSITION) {
             String state = mLauncher.getWorkspaceTransitionEffect();
             state = mapEffectToValue(state);
@@ -191,11 +191,11 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     .getString(R.string.drawer_sorting_text))) {
                 mLauncher.onClickSortModeButton(v);
             } else if (value.equals(res
-                    .getString(R.string.drawer_scroll_effect_text)) &&
+                    .getString(R.string.scroll_effect_text)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION)) {
                 mLauncher.onClickTransitionEffectButton(v, true);
             } else if (value.equals(res
-                    .getString(R.string.page_scroll_effect_text)) &&
+                    .getString(R.string.scroll_effect_text)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) {
                 mLauncher.onClickTransitionEffectButton(v, false);
             } else if (value.equals(res
-- 
cgit v1.2.3