summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlamefire <alex@grundis.de>2014-04-26 10:38:58 (GMT)
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-05-09 01:13:26 (GMT)
commit98adac0552dd188c2241636a2ddb7d1538f26f81 (patch)
treec1ddaa7e2236cb364437e9a613eacfcc32dd58fd
parent62316414fc295456cf980e387a27e9236cba75ac (diff)
downloadandroid_packages_apps_Trebuchet-98adac0552dd188c2241636a2ddb7d1538f26f81.zip
android_packages_apps_Trebuchet-98adac0552dd188c2241636a2ddb7d1538f26f81.tar.gz
android_packages_apps_Trebuchet-98adac0552dd188c2241636a2ddb7d1538f26f81.tar.bz2
Fix name of default
Change-Id: I562dc2572f1d8fdb69f615d1a7f0f425cc27d698
-rw-r--r--res/values/preferences_defaults.xml2
-rw-r--r--res/xml/preferences_homescreen.xml2
-rw-r--r--src/com/android/launcher3/Folder.java4
-rw-r--r--src/com/android/launcher3/Launcher.java2
-rw-r--r--src/com/android/launcher3/Workspace.java2
5 files changed, 6 insertions, 6 deletions
diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml
index 9d8e5f0..98d8bb7 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 4671a8a..1754cfa 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 1fcfa11..a00f3c1 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 2961842..3832048 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 376ebb4..37bd8aa 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);