diff options
| -rw-r--r-- | res/values-de/cm_strings.xml | 2 | ||||
| -rw-r--r-- | res/values-hu/cm_strings.xml | 2 | ||||
| -rw-r--r-- | res/values-nb/cm_strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences_homescreen.xml | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/Preferences.java | 14 |
6 files changed, 19 insertions, 9 deletions
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 95aa22c38..01659aa9d 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -99,6 +99,8 @@ <string name="preferences_interface_dock_default_page_summary">Die Standardseite festlegen</string> <string name="preferences_interface_dock_icons_title">Icons</string> <string name="preferences_interface_dock_icons_summary">Anzahl der Icons/Spalten des Docks festlegen</string> + <string name="preferences_interface_dock_hide_icon_labels_title">Beschriftung nicht anzeigen</string> + <string name="preferences_interface_dock_hide_icon_labels_summary">Beschriftung unterhalb der Dock-Icons nicht anzeigen</string> <string name="preferences_interface_dock_icon_scale_title">Icongröße</string> <string name="preferences_interface_dock_icon_scale_summary">Größe der Icons im Dock</string> <string name="preferences_interface_dock_divider_title">Dock-Abtrennung anzeigen</string> diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index cd8449f91..3eb8d1c53 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -99,6 +99,8 @@ <string name="preferences_interface_dock_default_page_summary">Válasszon alapértelmezett lapot</string> <string name="preferences_interface_dock_icons_title">Ikonok</string> <string name="preferences_interface_dock_icons_summary">Ikonok száma a tálcán</string> + <string name="preferences_interface_dock_hide_icon_labels_title">Ikonfeliratok elrejtése a tálcán</string> + <string name="preferences_interface_dock_hide_icon_labels_summary">Elrejti a tálcán lévő ikonok neveit</string> <string name="preferences_interface_dock_icon_scale_title">Ikonok mérete</string> <string name="preferences_interface_dock_icon_scale_summary">Tálcán szereplő ikonok mérete</string> <string name="preferences_interface_dock_divider_title">Tálca elválasztó</string> diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index fb0a822fb..f6e126455 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -99,6 +99,8 @@ <string name="preferences_interface_dock_default_page_summary">Velg en hovedside</string> <string name="preferences_interface_dock_icons_title">Ikoner</string> <string name="preferences_interface_dock_icons_summary">Antall ikoner/kolonner i dokksonen</string> + <string name="preferences_interface_dock_hide_icon_labels_title">Skjul etiketter</string> + <string name="preferences_interface_dock_hide_icon_labels_summary">Skjul etikettene som er under ikonene i dokksonen</string> <string name="preferences_interface_dock_icon_scale_title">Skalering av ikoner</string> <string name="preferences_interface_dock_icon_scale_summary">Skalering av ikoner i dokksonen</string> <string name="preferences_interface_dock_divider_title">Vis en linje</string> diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 0574da1cd..b89ebe646 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -18,7 +18,9 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" android:key="ui_homescreen" android:title="@string/preferences_interface_homescreen_title"> - <PreferenceCategory android:title="@string/preferences_interface_homescreen_general_category"> + <PreferenceCategory + android:key="ui_homescreen_general" + android:title="@string/preferences_interface_homescreen_general_category"> <com.cyanogenmod.trebuchet.preference.DoubleNumberPickerPreference android:key="ui_homescreen_grid" android:title="@string/preferences_interface_homescreen_general_grid_title" android:summary="@string/preferences_interface_homescreen_general_grid_summary" diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java index a38d82606..1b87c4f39 100644 --- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java +++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java @@ -383,7 +383,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Preferences mJoinWidgetsApps = PreferencesProvider.Interface.Drawer.getJoinWidgetsApps(); - mVertical = PreferencesProvider.Interface.Drawer.getVertical(); mTransitionEffect = PreferencesProvider.Interface.Drawer.Scrolling.getTransitionEffect( resources.getString(R.string.config_drawerDefaultTransitionEffect)); mFadeInAdjacentScreens = PreferencesProvider.Interface.Drawer.Scrolling.getFadeInAdjacentScreens(); @@ -427,7 +426,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override protected void init() { super.init(); - mCenterPages = false; + mVertical = PreferencesProvider.Interface.Drawer.getVertical(); + mCenterPages = LauncherApplication.isScreenLarge() && mVertical; Context context = getContext(); Resources r = context.getResources(); diff --git a/src/com/cyanogenmod/trebuchet/preference/Preferences.java b/src/com/cyanogenmod/trebuchet/preference/Preferences.java index 45174e10f..9b3996083 100644 --- a/src/com/cyanogenmod/trebuchet/preference/Preferences.java +++ b/src/com/cyanogenmod/trebuchet/preference/Preferences.java @@ -18,14 +18,12 @@ package com.cyanogenmod.trebuchet.preference; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.Resources; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; +import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; -import android.preference.PreferenceScreen; import android.text.TextUtils; -import android.util.Log; import android.view.MenuItem; import android.view.LayoutInflater; import android.view.View; @@ -127,9 +125,13 @@ public class Preferences extends PreferenceActivity addPreferencesFromResource(R.xml.preferences_homescreen); - PreferenceScreen preferenceScreen = getPreferenceScreen(); - if (LauncherApplication.isScreenLarge()) { - preferenceScreen.removePreference(findPreference("ui_homescreen_grid")); + PreferenceCategory general = (PreferenceCategory)findPreference("ui_homescreen_general"); + boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid); + if (general != null && (LauncherApplication.isScreenLarge() && workspaceTabletGrid == false)) { + Preference grid = findPreference("ui_homescreen_grid"); + if (grid != null) { + general.removePreference(grid); + } } } } |