diff options
| author | black <blackzigong@gmail.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | 5dc390cde4aa6efc41e145610bb993e4754fd440 (patch) | |
| tree | 01532187f6d4a6029ce7819e8a11cb11158c400a /src/com/android/launcher3/OverviewSettingsPanel.java | |
| parent | 7360319a4322bc042a3cad30030070273a8d6c80 (diff) | |
| download | android_packages_apps_Trebuchet-5dc390cde4aa6efc41e145610bb993e4754fd440.tar.gz android_packages_apps_Trebuchet-5dc390cde4aa6efc41e145610bb993e4754fd440.tar.bz2 android_packages_apps_Trebuchet-5dc390cde4aa6efc41e145610bb993e4754fd440.zip | |
Trebuchet: Change icon labels option strings
Conflicts:
src/com/android/launcher3/OverviewSettingsPanel.java
Change-Id: I499ec846bf2c7b2dc1c0d39c2c62a2525412335c
Diffstat (limited to 'src/com/android/launcher3/OverviewSettingsPanel.java')
| -rw-r--r-- | src/com/android/launcher3/OverviewSettingsPanel.java | 28 |
1 files changed, 22 insertions, 6 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); |