diff options
-rw-r--r-- | res/values/preferences_defaults.xml | 2 | ||||
-rw-r--r-- | res/xml/preferences_homescreen.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Folder.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 9d8e5f010..98d8bb7a8 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -5,7 +5,7 @@ <bool name="preferences_interface_homescreen_scrolling_wallpaper_scroll_default">true</bool> <bool name="preferences_interface_homescreen_scrolling_page_outlines_default">@bool/config_workspaceDefaultShowOutlines</bool> <bool name="preferences_interface_homescreen_scrolling_fade_adjacent_default">@bool/config_workspaceFadeAdjacentScreens</bool> - <bool name="preferences_interface_homescreen_hide_icon_labels">false</bool> + <bool name="preferences_interface_homescreen_hide_icon_labels_default">false</bool> <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string> <bool name="preferences_interface_drawer_scrolling_fade_adjacent_default">false</bool> <bool name="preferences_interface_drawer_remove_hidden_apps_shortcuts_default">false</bool> diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 4671a8a4a..1754cfa02 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -25,5 +25,5 @@ <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels" android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title" android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" - android:defaultValue="@bool/preferences_interface_homescreen_hide_icon_labels" /> + android:defaultValue="@bool/preferences_interface_homescreen_hide_icon_labels_default" /> </PreferenceScreen> diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 1fcfa1173..a00f3c1da 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -195,7 +195,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (SettingsProvider.getBoolean(mLauncher, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels)) { + R.bool.preferences_interface_homescreen_hide_icon_labels_default)) { mFolderName.setVisibility(View.GONE); mFolderNameHeight = getPaddingBottom(); } @@ -276,7 +276,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList String newTitle = mFolderName.getText().toString(); if (!SettingsProvider.getBoolean(mLauncher, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels)) { + R.bool.preferences_interface_homescreen_hide_icon_labels_default)) { mInfo.setTitle(newTitle); } LauncherModel.updateItemInDatabase(mLauncher, mInfo); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 29618422d..383204817 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -391,7 +391,7 @@ public class Launcher extends Activity mHideIconLabels = SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels); + R.bool.preferences_interface_homescreen_hide_icon_labels_default); // Determine the dynamic grid properties Point smallestSize = new Point(); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 376ebb483..37bd8aa73 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -315,7 +315,7 @@ public class Workspace extends SmoothPagedView R.bool.preferences_interface_homescreen_scrolling_page_outlines_default); mHideIconLabels = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, - R.bool.preferences_interface_homescreen_hide_icon_labels); + R.bool.preferences_interface_homescreen_hide_icon_labels_default); mWorkspaceFadeInAdjacentScreens = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT, R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default); |