diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-05-08 18:22:00 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-05-08 18:22:00 -0700 |
| commit | 5bd2daf53614d9d47514be7c6ac702474a523cef (patch) | |
| tree | c1ddaa7e2236cb364437e9a613eacfcc32dd58fd /src/com/android/launcher3/Launcher.java | |
| parent | 9ade3e01a20d6ff8d67331eed37b5c1511f586c3 (diff) | |
| parent | 98adac0552dd188c2241636a2ddb7d1538f26f81 (diff) | |
| download | android_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.tar.gz android_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.tar.bz2 android_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.zip | |
Merge remote-tracking branch 'github/cm-11.0' into HEAD
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |