diff options
| author | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
| commit | d8284f229dfa8d0e2aef3cac0828362e1e6632e1 (patch) | |
| tree | 57b913502af687d5a27c3ce3a82b964802b5112c /src/com/android/launcher3/settings | |
| parent | 4c3b2364453fb21dc3f3f8a70e1bcc64e500d83d (diff) | |
| parent | 06e3e072e0b70b01dd1d4e2d859d70832d16172c (diff) | |
| download | android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.gz android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.bz2 android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.zip | |
Merge branch 'github/staging/cm-12.1' into caf/cm-12.1.
Conflicts:
WallpaperPicker/res/values-nodpi/wallpapers.xml
res/layout/settings_pane.xml
res/values-zh-rCN/cm_strings.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/DynamicGrid.java
Change-Id: I22eb2e38e8802985e0e0a8cb3e68d73189c2c1a4
Diffstat (limited to 'src/com/android/launcher3/settings')
| -rw-r--r-- | src/com/android/launcher3/settings/SettingsProvider.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java index 0bcdc69ae..2f36fc422 100644 --- a/src/com/android/launcher3/settings/SettingsProvider.java +++ b/src/com/android/launcher3/settings/SettingsProvider.java @@ -44,6 +44,7 @@ public final class SettingsProvider { public static final String SETTINGS_UI_GENERAL_ICONS_TEXT_FONT_FAMILY = "ui_general_icons_text_font"; public static final String SETTINGS_UI_GENERAL_ICONS_TEXT_FONT_STYLE = "ui_general_icons_text_font_style"; public static final String SETTINGS_UI_DRAWER_SORT_MODE = "ui_drawer_sort_mode"; + public static final String SETTINGS_UI_DRAWER_TYPE = "ui_drawer_type"; public static SharedPreferences get(Context context) { return context.getSharedPreferences(SETTINGS_KEY, Context.MODE_MULTI_PROCESS); |