diff options
author | Joey Rizzoli <joey@lineageos.org> | 2017-11-30 21:59:30 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-19 00:27:13 +0100 |
commit | 0fb16bbd36976824ebf1d32a3dfd2fbfc565a6f7 (patch) | |
tree | a148ffa9977bc98261e33e1e88f70d706115fd72 /res/xml | |
parent | c6b85822544de5194cff97d7fe07236f5c7a5b32 (diff) | |
download | android_packages_apps_Trebuchet-0fb16bbd36976824ebf1d32a3dfd2fbfc565a6f7.tar.gz android_packages_apps_Trebuchet-0fb16bbd36976824ebf1d32a3dfd2fbfc565a6f7.tar.bz2 android_packages_apps_Trebuchet-0fb16bbd36976824ebf1d32a3dfd2fbfc565a6f7.zip |
Trebuchet: quick settings & settings reorganization
Signed-off-by: Joey Rizzoli <joey@lineageos.org>
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/launcher_preferences.xml | 136 | ||||
-rw-r--r-- | res/xml/launcher_quick_preferences.xml | 34 |
2 files changed, 106 insertions, 64 deletions
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index 22bd3e514..a130e3c07 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 Google Inc. +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 Google Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,76 +14,85 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <PreferenceCategory + android:key="category_home" + android:title="@string/settings_category_home"> - <com.android.launcher3.views.ButtonPreference - android:key="pref_icon_badging" - android:title="@string/icon_badging_title" - android:persistent="false" - android:widgetLayout="@layout/notification_pref_warning" > - <intent android:action="android.settings.NOTIFICATION_SETTINGS"> - <!-- This extra highlights the "Allow icon badges" field in Notification settings --> - <extra - android:name=":settings:fragment_args_key" - android:value="notification_badging" /> - </intent> - </com.android.launcher3.views.ButtonPreference> + <SwitchPreference + android:defaultValue="@bool/allow_rotation" + android:icon="@drawable/ic_settings_rotation" + android:key="pref_allowRotation" + android:persistent="true" + android:title="@string/settings_rotation_title" /> - <SwitchPreference - android:key="pref_add_icon_to_home" - android:title="@string/auto_add_shortcuts_label" - android:summary="@string/auto_add_shortcuts_description" - android:defaultValue="true" - android:persistent="true" - /> + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/ic_settings_swipe_down" + android:key="pref_expand_statusbar" + android:persistent="true" + android:title="@string/statusbar_expand" /> - <SwitchPreference - android:key="pref_allowRotation" - android:title="@string/allow_rotation_title" - android:defaultValue="@bool/allow_rotation" - android:persistent="true" - /> + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/ic_settings_add_shortcut" + android:key="pref_add_icon_to_home" + android:persistent="true" + android:summary="@string/auto_add_shortcuts_description" + android:title="@string/auto_add_shortcuts_label" /> - <ListPreference - android:key="pref_override_icon_shape" - android:title="@string/icon_shape_override_label" - android:summary="%s" - android:entries="@array/icon_shape_override_paths_names" - android:entryValues="@array/icon_shape_override_paths_values" - android:defaultValue="" - android:persistent="false" /> + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/ic_settings_label_workspace" + android:key="pref_desktop_show_labels" + android:persistent="true" + android:title="@string/desktop_show_labels" /> + </PreferenceCategory> - <SwitchPreference - android:key="pref_expand_statusbar" - android:title="@string/statusbar_expand" - android:defaultValue="true" - android:persistent="true" /> + <PreferenceCategory android:title="@string/settings_category_drawer"> - <SwitchPreference - android:key="pref_predictive_apps" - android:title="@string/predictive_apps_title" - android:summaryOn="@string/predictive_apps_summary_on" - android:summaryOff="@string/predictive_apps_summary_off" - android:defaultValue="true" - android:persistent="true" /> + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/ic_settings_predictive" + android:key="pref_predictive_apps" + android:persistent="true" + android:summaryOff="@string/predictive_apps_summary_off" + android:summaryOn="@string/predictive_apps_summary_on" + android:title="@string/predictive_apps_title" /> - <Preference - android:key="pref_grid_size" - android:title="@string/grid_size_text" - android:persistent="true" /> + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/ic_settings_label_drawer" + android:key="pref_drawer_show_labels" + android:persistent="true" + android:title="@string/drawer_show_labels" /> + </PreferenceCategory> - <SwitchPreference - android:key="pref_desktop_show_labels" - android:title="@string/desktop_show_labels" - android:defaultValue="true" - android:persistent="true" /> + <PreferenceCategory + android:key="category_icons" + android:title="@string/settings_category_icons"> - <SwitchPreference - android:key="pref_drawer_show_labels" - android:title="@string/drawer_show_labels" - android:defaultValue="true" - android:persistent="true" /> + <ListPreference + android:defaultValue="" + android:entries="@array/icon_shape_override_paths_names" + android:entryValues="@array/icon_shape_override_paths_values" + android:icon="@drawable/ic_settings_shape" + android:key="pref_override_icon_shape" + android:persistent="false" + android:summary="%s" + android:title="@string/settings_icon_shape" /> - <Preference - android:key="pref_icon_pack" - android:title="@string/icon_pack_title" /> + <com.android.launcher3.views.ButtonPreference + android:key="pref_icon_badging" + android:title="@string/icon_badging_title" + android:persistent="false" + android:icon="@drawable/ic_settings_notification" + android:widgetLayout="@layout/notification_pref_warning" > + <intent android:action="android.settings.NOTIFICATION_SETTINGS"> + <!-- This extra highlights the "Allow icon badges" field in Notification settings --> + <extra + android:name=":settings:fragment_args_key" + android:value="notification_badging" /> + </intent> + </com.android.launcher3.views.ButtonPreference> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/launcher_quick_preferences.xml b/res/xml/launcher_quick_preferences.xml new file mode 100644 index 000000000..559e7825a --- /dev/null +++ b/res/xml/launcher_quick_preferences.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <Preference + android:defaultValue="default" + android:key="pref_grid_size" + android:persistent="true" + android:icon="@drawable/ic_settings_grid" + android:title="@string/grid_size_text" /> + + <Preference + android:key="pref_icon_pack" + android:title="@string/icon_pack_title" /> + + <Preference + android:key="pref_more" + android:icon="@drawable/ic_settings_more" + android:title="@string/settings_more" /> + +</PreferenceScreen> |