diff options
Diffstat (limited to 'res')
23 files changed, 579 insertions, 286 deletions
diff --git a/res/drawable-hdpi/ic_audio_ring_24dp.png b/res/drawable-hdpi/ic_audio_ring_24dp.png Binary files differnew file mode 100755 index 0000000..69a7e90 --- /dev/null +++ b/res/drawable-hdpi/ic_audio_ring_24dp.png diff --git a/res/drawable-mdpi/ic_audio_ring_24dp.png b/res/drawable-mdpi/ic_audio_ring_24dp.png Binary files differnew file mode 100755 index 0000000..5e15c2a --- /dev/null +++ b/res/drawable-mdpi/ic_audio_ring_24dp.png diff --git a/res/drawable-xhdpi/ic_audio_ring_24dp.png b/res/drawable-xhdpi/ic_audio_ring_24dp.png Binary files differnew file mode 100755 index 0000000..82bbdb1 --- /dev/null +++ b/res/drawable-xhdpi/ic_audio_ring_24dp.png diff --git a/res/drawable-xxhdpi/ic_audio_ring_24dp.png b/res/drawable-xxhdpi/ic_audio_ring_24dp.png Binary files differnew file mode 100755 index 0000000..f198d96 --- /dev/null +++ b/res/drawable-xxhdpi/ic_audio_ring_24dp.png diff --git a/res/drawable/ic_settings_notification_drawer.xml b/res/drawable/ic_settings_notification_drawer.xml new file mode 100644 index 0000000..a83989e --- /dev/null +++ b/res/drawable/ic_settings_notification_drawer.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The CyanogenMod Project + + 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <group> + <path + android:fillColor="#009688" + android:pathData="M20.815,16.008h-17.5c-0.138,0-0.25,0.112-0.25,0.25v3.5c0,0.138,0.112,0.25,0.25,0.25h17.5 +c0.138,0,0.25-0.112,0.25-0.25v-3.5C21.065,16.12,20.953,16.008,20.815,16.008Z +M4.878,19.07c-0.552,0-1-0.448-1-1 +c0-0.552,0.448-1,1-1c0.552,0,1,0.448,1,1C5.878,18.623,5.43,19.07,4.878,19.07z" /> + <path + android:fillColor="#009688" + android:pathData="M20.815,11.008h-17.5c-0.138,0-0.25,0.112-0.25,0.25v3.5c0,0.138,0.112,0.25,0.25,0.25h17.5 +c0.138,0,0.25-0.112,0.25-0.25v-3.5C21.065,11.12,20.953,11.008,20.815,11.008Z +M4.878,14.07c-0.552,0-1-0.448-1-1 +c0-0.552,0.448-1,1-1c0.552,0,1,0.448,1,1C5.878,13.623,5.43,14.07,4.878,14.07z" /> + <path + android:fillColor="#009688" + android:pathData="M20.815,6.008h-17.5c-0.138,0-0.25,0.112-0.25,0.25v3.5c0,0.138,0.112,0.25,0.25,0.25h17.5 +c0.138,0,0.25-0.112,0.25-0.25v-3.5C21.065,6.12,20.953,6.008,20.815,6.008Z +M4.878,9.07c-0.552,0-1-0.448-1-1c0-0.552,0.448-1,1-1 +c0.552,0,1,0.448,1,1C5.878,8.623,5.43,9.07,4.878,9.07z" /> + <path + android:fillColor="#009688" + android:pathData="M22,3v2H2V3H22Z" /> + </group> +</vector> diff --git a/res/drawable/ic_settings_sounds.xml b/res/drawable/ic_settings_sounds.xml new file mode 100644 index 0000000..c6531c5 --- /dev/null +++ b/res/drawable/ic_settings_sounds.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The CyanogenMod Project + + 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#009688" + android:pathData="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 +2.5-4.02zM14 3.23v2.06c2.89 .86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91 +7-4.49 7-8.77s-2.99-7.86-7-8.77z" /> +</vector> diff --git a/res/menu/privacy_guard_manager.xml b/res/menu/privacy_guard_manager.xml index 5e41e46..e088ccb 100644 --- a/res/menu/privacy_guard_manager.xml +++ b/res/menu/privacy_guard_manager.xml @@ -23,7 +23,7 @@ android:title="@string/privacy_guard_manager_show_system_apps" android:checkable="true" /> <item android:id="@+id/advanced" - android:title="@string/privacy_guard_advanced_settings_title" /> + android:title="@string/advanced" /> <item android:id="@+id/help" android:title="@string/privacy_guard_help_title" /> </menu> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index d14a88e..b2ccb76 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -698,7 +698,6 @@ <string name="privacy_guard_reset_text">Reset permissions?</string> <string name="privacy_guard_help_text">In this screen you can choose which apps Privacy Guard should be active for by simply tapping on them. Selected apps will not be able to access your personal data such as contacts, messages or call logs. Long pressing an app\'s entry opens its app details screen.\n\nBuilt-in apps are not shown by default but can be revealed by selecting the respective menu option.</string> <string name="privacy_guard_manager_show_system_apps">Show built-in apps</string> - <string name="privacy_guard_advanced_settings_title">Advanced</string> <!-- Battery saver --> <string name="battery_saver_threshold">Battery saver threshold</string> @@ -851,4 +850,15 @@ <![CDATA[<b>Total contributors:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/> <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/> <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string> -</resources>
\ No newline at end of file + + <string name="category_sounds">Sounds</string> + <string name="notification_manager">Notifications</string> + <string name="lockscreen_settings">Lock screen</string> + <string name="lockscreen_settings">Lock screen</string> + <string name="category_lights">Lights</string> + <string name="category_volume">Volume</string> + <string name="category_vibrate">Vibrate</string> + <string name="category_misc">Miscellaneous</string> + <string name="title_general">General</string> + <string name="advanced">Advanced</string> +</resources> diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml index d62b538..d144698 100644 --- a/res/xml/button_settings.xml +++ b/res/xml/button_settings.xml @@ -29,17 +29,8 @@ android:dialogTitle="@string/button_backlight_title" android:persistent="false" /> - <!-- Device Specific Bluetooth Input settings --> - <Preference - android:key="bluetooth_input_settings"> - <intent - android:action="com.cyanogenmod.action.LAUNCH_BLUETOOTH_INPUT_SETTINGS" - android:targetPackage="com.cyanogenmod.settings.device" - android:targetClass="com.cyanogenmod.settings.device.BluetoothInputSettings" /> - </Preference> - <PreferenceCategory - android:key="navigation_bar" + android:key="navigation_bar_category" android:title="@string/navigation_bar_category" > <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml index a6013f0..4b893a8 100644 --- a/res/xml/dashboard_categories.xml +++ b/res/xml/dashboard_categories.xml @@ -80,6 +80,12 @@ android:icon="@drawable/ic_settings_more" /> + <!-- Manufacturer hook --> + <dashboard-tile + android:id="@+id/manufacturer_settings" + android:fragment="com.android.settings.WirelessSettings"> + <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" /> + </dashboard-tile> </dashboard-category> <!-- DEVICE --> @@ -88,76 +94,70 @@ android:key="@string/category_key_device" android:title="@string/header_category_device" > + <!-- Sound --> <dashboard-tile - android:id="@+id/button_settings" - android:title="@string/button_pref_title" - android:fragment="com.android.settings.ButtonSettings" - android:icon="@drawable/ic_settings_buttons" - /> - - <!-- Home --> - <dashboard-tile - android:id="@+id/home_settings" - android:title="@string/home_settings" - android:fragment="com.android.settings.HomeSettings" - android:icon="@drawable/ic_settings_home" + android:id="@+id/sound_settings" + android:title="@string/category_sounds" + android:fragment="com.android.settings.notification.SoundSettings" + android:icon="@drawable/ic_settings_sounds" /> - <!-- Display --> + <!-- Display & lights --> <dashboard-tile - android:id="@+id/display_settings" - android:title="@string/display_settings" + android:id="@+id/display_and_lights_settings" + android:title="@string/display_and_lights" android:fragment="com.android.settings.DisplaySettings" android:icon="@drawable/ic_settings_display" /> - <!-- Gestures --> - <dashboard-tile - android:id="@+id/device_specific_gesture_settings" - android:title="@string/gesture_settings_title" - android:icon="@drawable/ic_settings_gestures"> - <intent - android:action="com.cyanogenmod.action.LAUNCH_TOUCHSCREEN_GESTURE_SETTINGS" - android:targetPackage="com.cyanogenmod.settings.device" - android:targetClass="com.cyanogenmod.settings.device.TouchscreenGestureSettings" /> - </dashboard-tile> - <!-- Themes --> <!-- NOTE: Intent.parseIntent looks for "categories" tag and not "category" --> <dashboard-tile - android:id="@+id/theme_settings" - android:title="@string/themes_settings_title" - android:icon="@drawable/ic_settings_themes"> + android:id="@+id/theme_settings" + android:title="@string/themes_settings_title" + android:icon="@drawable/ic_settings_themes"> <intent - android:action="android.intent.action.MAIN" > + android:action="android.intent.action.MAIN" > <categories android:name="cyanogenmod.intent.category.APP_THEMES" /> </intent> </dashboard-tile> - <!-- Notifications --> + <!-- Notification manager --> <dashboard-tile - android:id="@+id/notification_settings" - android:title="@string/notification_settings" - android:fragment="com.android.settings.notification.NotificationSettings" + android:id="@+id/notification_manager" + android:title="@string/notification_manager" + android:fragment="com.android.settings.notification.NotificationManagerSettings" android:icon="@drawable/ic_settings_notifications" /> - <!-- Application Settings --> + <!-- Lock screen --> <dashboard-tile - android:id="@+id/application_settings" - android:title="@string/applications_settings" - android:fragment="com.android.settings.applications.ManageApplications" - android:icon="@drawable/ic_settings_applications" - /> + android:id="@+id/lockscreen_settings" + android:title="@string/lockscreen_settings" + android:fragment="com.android.settings.SecuritySettings" + android:icon="@drawable/ic_settings_security"> + <extra android:name="filter_type" android:value="0" /> + </dashboard-tile> - <!-- Storage --> + <!-- Buttons --> <dashboard-tile - android:id="@+id/storage_settings" - android:title="@string/storage_usb_settings" - android:fragment="com.android.settings.deviceinfo.StorageSettings" - android:icon="@drawable/ic_settings_storage" + android:id="@+id/button_settings" + android:title="@string/button_pref_title" + android:fragment="com.android.settings.ButtonSettings" + android:icon="@drawable/ic_settings_buttons" /> + <!-- Gestures --> + <dashboard-tile + android:id="@+id/device_specific_gesture_settings" + android:title="@string/gesture_settings_title" + android:icon="@drawable/ic_settings_gestures"> + <intent + android:action="com.cyanogenmod.action.LAUNCH_TOUCHSCREEN_GESTURE_SETTINGS" + android:targetPackage="com.cyanogenmod.settings.device" + android:targetClass="com.cyanogenmod.settings.device.TouchscreenGestureSettings" /> + </dashboard-tile> + <!-- Battery --> <dashboard-tile android:id="@+id/battery_settings" @@ -166,6 +166,14 @@ android:icon="@drawable/ic_settings_battery" /> + <!-- Security --> + <dashboard-tile + android:id="@+id/security_settings" + android:title="@string/security_settings_title" + android:fragment="com.android.settings.SecuritySettings" + android:icon="@drawable/ic_settings_security"> + </dashboard-tile> + <!-- Memory --> <dashboard-tile android:id="@+id/manage_memory" @@ -182,29 +190,22 @@ android:icon="@drawable/ic_settings_multiuser" /> - <!-- Manage NFC payment apps --> - <dashboard-tile - android:id="@+id/nfc_payment_settings" - android:title="@string/nfc_payment_settings_title" - android:fragment="com.android.settings.nfc.PaymentSettings" - android:icon="@drawable/ic_settings_nfc_payment" - /> - - <!-- Manufacturer hook --> - <dashboard-tile - android:id="@+id/manufacturer_settings" - android:fragment="com.android.settings.WirelessSettings"> - <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" /> - </dashboard-tile> - </dashboard-category> - <!-- PERSONAL --> + <!-- Personalization --> <dashboard-category android:id="@+id/personal_section" android:key="@string/category_key_personal" android:title="@string/header_category_personal" > + <!-- Home --> + <dashboard-tile + android:id="@+id/home_settings" + android:title="@string/home_settings" + android:fragment="com.android.settings.HomeSettings" + android:icon="@drawable/ic_settings_home" + /> + <!-- Profiles --> <dashboard-tile android:id="@+id/profile_settings" @@ -221,29 +222,12 @@ android:icon="@drawable/ic_settings_extdesk_hidenavbar" /> - <!-- Location --> - <dashboard-tile - android:id="@+id/location_settings" - android:title="@string/location_settings_title" - android:fragment="com.android.settings.location.LocationSettings" - android:icon="@drawable/ic_settings_location" - /> - - <!-- Security --> - <dashboard-tile - android:id="@+id/security_settings" - android:title="@string/security_settings_title" - android:fragment="com.android.settings.SecuritySettings" - android:icon="@drawable/ic_settings_security" - /> - - <!-- CyanogenMod Privacy Settings --> - <!-- This is the 'real' Privacy items and includes Privacy Guard, Blacklist & WhisperPush --> + <!-- Application Settings --> <dashboard-tile - android:id="@+id/privacy_settings_cyanogenmod" - android:title="@string/privacy_settings_cyanogenmod_title" - android:fragment="com.android.settings.cyanogenmod.PrivacySettings" - android:icon="@drawable/ic_settings_privacy" + android:id="@+id/application_settings" + android:title="@string/applications_settings" + android:fragment="com.android.settings.applications.ManageApplications" + android:icon="@drawable/ic_settings_applications" /> <!-- Account --> @@ -257,20 +241,21 @@ <!-- Marker for where to place external tiles in this category --> <external-tiles /> - <!-- Language --> + <!-- CyanogenMod Privacy Settings --> + <!-- This is the 'real' Privacy items and includes Privacy Guard, Blacklist & WhisperPush --> <dashboard-tile - android:id="@+id/language_settings" - android:title="@string/language_settings" - android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings" - android:icon="@drawable/ic_settings_language" + android:id="@+id/privacy_settings_cyanogenmod" + android:title="@string/privacy_settings_cyanogenmod_title" + android:fragment="com.android.settings.cyanogenmod.PrivacySettings" + android:icon="@drawable/ic_settings_privacy" /> - <!-- Backup and reset --> + <!-- Location --> <dashboard-tile - android:id="@+id/privacy_settings" - android:title="@string/privacy_settings" - android:fragment="com.android.settings.PrivacySettings" - android:icon="@drawable/ic_settings_backup" + android:id="@+id/location_settings" + android:title="@string/location_settings_title" + android:fragment="com.android.settings.location.LocationSettings" + android:icon="@drawable/ic_settings_location" /> </dashboard-category> @@ -297,6 +282,30 @@ android:icon="@drawable/ic_settings_accessibility" /> + <!-- Storage --> + <dashboard-tile + android:id="@+id/storage_settings" + android:title="@string/storage_usb_settings" + android:fragment="com.android.settings.deviceinfo.StorageSettings" + android:icon="@drawable/ic_settings_storage" + /> + + <!-- Language --> + <dashboard-tile + android:id="@+id/language_settings" + android:title="@string/language_settings" + android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings" + android:icon="@drawable/ic_settings_language" + /> + + <!-- Backup and reset --> + <dashboard-tile + android:id="@+id/privacy_settings" + android:title="@string/privacy_settings" + android:fragment="com.android.settings.PrivacySettings" + android:icon="@drawable/ic_settings_backup" + /> + <!-- Print --> <dashboard-tile android:id="@+id/print_settings" diff --git a/res/xml/display_settings.xml b/res/xml/display.xml index a196460..35792de 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- + Copyright (C) 2015 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:title="@string/display_settings" - settings:keywords="@string/keywords_display"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + + <PreferenceCategory + android:key="display" + android:title="@string/display_label"> + <!-- Brightness slider --> <PreferenceScreen android:key="brightness" android:title="@string/brightness" @@ -26,6 +29,7 @@ <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" /> </PreferenceScreen> + <!-- Adaptive brightness --> <SwitchPreference android:key="auto_brightness" android:title="@string/auto_brightness_title" @@ -33,46 +37,6 @@ android:summary="@string/auto_brightness_summary" android:persistent="false" /> - <!-- Hide night mode for now - <ListPreference - android:key="night_mode" - android:title="@string/night_mode_title" - settings:keywords="@string/keywords_display_night_mode" - android:summary="@string/night_mode_summary" - android:persistent="false" - android:entries="@array/night_mode_entries" - android:entryValues="@array/night_mode_values" /> --> - - <PreferenceScreen - android:key="display_rotation" - android:title="@string/display_rotation_title" - android:fragment="com.android.settings.cyanogenmod.DisplayRotation" /> - - <ListPreference - android:key="screen_timeout" - android:title="@string/screen_timeout" - android:summary="@string/screen_timeout_summary" - android:persistent="false" - android:entries="@array/screen_timeout_entries" - android:entryValues="@array/screen_timeout_values" /> - - <SwitchPreference - android:key="camera_gesture" - android:title="@string/camera_gesture_title" - android:summary="@string/camera_gesture_desc" - android:persistent="false" /> - - <SwitchPreference - android:key="camera_double_tap_power_gesture" - android:title="@string/camera_double_tap_power_gesture_title" - android:summary="@string/camera_double_tap_power_gesture_desc" - android:persistent="false" /> - - <PreferenceScreen - android:key="screensaver" - android:title="@string/screensaver_settings_title" - android:fragment="com.android.settings.DreamSettings" /> - <!-- LiveDisplay --> <PreferenceScreen android:key="live_display" @@ -80,92 +44,141 @@ android:summary="@string/live_display_summary" android:fragment="com.android.settings.livedisplay.LiveDisplay" /> - <SwitchPreference - android:key="lift_to_wake" - android:title="@string/lift_to_wake_title" - android:persistent="false" /> + <PreferenceScreen + android:key="wallpaper" + android:title="@string/wallpaper_settings_title" + settings:keywords="@string/keywords_display_wallpaper" + android:fragment="com.android.settings.WallpaperTypeSettings" /> + + <!-- Rotation modes --> + <PreferenceScreen + android:key="display_rotation" + android:title="@string/display_rotation_title" + android:fragment="com.android.settings.cyanogenmod.DisplayRotation"/> + <!-- Doze // Ambient display --> <SwitchPreference android:key="doze" android:title="@string/doze_title" android:summary="@string/doze_summary" android:persistent="false" /> + <!-- Lift to wake --> + <SwitchPreference + android:key="lift_to_wake" + android:title="@string/lift_to_wake_title" + android:persistent="false" /> + + <!-- Double tap to wake --> <SwitchPreference android:key="tap_to_wake" android:title="@string/tap_to_wake" android:summary="@string/tap_to_wake_summary" android:persistent="false" /> - <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference - android:key="proximity_on_wake" - android:title="@string/proximity_wake_title" - android:summary="@string/proximity_wake_summary" - android:defaultValue="true" /> - - <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference + <!-- Double tap to sleep --> + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference android:key="double_tap_sleep_gesture" android:title="@string/double_tap_to_sleep_title" android:summary="@string/double_tap_to_sleep_summary" android:defaultValue="true" /> - <ListPreference - android:key="lcd_density" - android:title="@string/lcd_density" + <SwitchPreference + android:key="camera_gesture" + android:title="@string/camera_gesture_title" + android:summary="@string/camera_gesture_desc" android:persistent="false" /> + <SwitchPreference + android:key="camera_double_tap_power_gesture" + android:title="@string/camera_double_tap_power_gesture_title" + android:summary="@string/camera_double_tap_power_gesture_desc" + android:persistent="false" /> + + <!-- Prevent accidental wake-up --> + <SwitchPreference + android:key="proximity_on_wake" + android:title="@string/proximity_wake_title" + android:summary="@string/proximity_wake_summary"/> + + <!-- Seconds before sleep --> + <ListPreference + android:key="screen_timeout" + android:title="@string/screen_timeout" + android:summary="@string/screen_timeout_summary" + android:persistent="false" + android:entries="@array/screen_timeout_entries" + android:entryValues="@array/screen_timeout_values" /> + + <!-- Wake on plug --> + <SwitchPreference + android:key="wake_when_plugged_or_unplugged" + android:title="@string/wake_when_plugged_or_unplugged_title" + android:summary="@string/wake_when_plugged_or_unplugged_summary" + android:defaultValue="false"/> + + <!-- Cast screen --> <PreferenceScreen android:key="wifi_display" android:title="@string/wifi_display_settings_title" settings:keywords="@string/keywords_display_cast_screen" android:fragment="com.android.settings.wfd.WifiDisplaySettings" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="interface" + android:title="@string/category_interface"> + <!-- expanded desktop --> + <PreferenceScreen + android:key="expanded_desktop" + android:title="@string/power_menu_expanded_desktop" + android:fragment="com.android.settings.applications.ExpandedDesktopPreferenceFragment"/> + + <!-- DPI chooser --> + <ListPreference + android:key="lcd_density" + android:title="@string/lcd_density" + android:persistent="false" /> + + <!-- Day dream --> + <PreferenceScreen + android:key="screensaver" + android:title="@string/screensaver_settings_title" + android:fragment="com.android.settings.DreamSettings" /> + + <!-- Font size --> + <com.android.settings.FontDialogPreference + android:key="font_size" + android:title="@string/title_font_size" + settings:keywords="@string/keywords_display_font_size" + android:summary="@string/summary_font_size" + android:dialogTitle="@string/dialog_title_font_size" /> + + <!-- Search in Recents --> + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="recents_show_search_bar" + android:title="@string/recents_show_searchbar" + settings:keywords="@string/keywords_recents_show_searchbar" + android:defaultValue="true" /> + + </PreferenceCategory> + + <PreferenceCategory + android:key="lights" + android:title="@string/category_lights"> + + <!-- Battery light --> + <PreferenceScreen + android:key="battery_light" + android:title="@string/battery_light_title" + android:fragment="com.android.settings.notificationlight.BatteryLightSettings" /> + + <!-- Notification lights --> + <PreferenceScreen + android:key="notification_light" + android:title="@string/notification_light_title" + android:fragment="com.android.settings.notificationlight.NotificationLightSettings" /> - <PreferenceCategory - android:key="interface" - android:title="@string/category_interface"> - - <PreferenceScreen - android:key="wallpaper" - android:title="@string/wallpaper_settings_title" - settings:keywords="@string/keywords_display_wallpaper" - android:fragment="com.android.settings.WallpaperTypeSettings" /> - - <!-- expanded desktop --> - <PreferenceScreen - android:key="expanded_desktop" - android:title="@string/power_menu_expanded_desktop" - android:fragment="com.android.settings.applications.ExpandedDesktopPreferenceFragment" /> - - <!-- Search in Recents --> - <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference - android:key="recents_show_search_bar" - android:title="@string/recents_show_searchbar" - android:defaultValue="true" /> - - <com.android.settings.FontDialogPreference - android:key="font_size" - android:title="@string/title_font_size" - settings:keywords="@string/keywords_display_font_size" - android:summary="@string/summary_font_size" - android:dialogTitle="@string/dialog_title_font_size" /> - - </PreferenceCategory> - - <PreferenceCategory - android:key="advanced_display_prefs" - android:title="@string/advanced_settings"> - - <SwitchPreference - android:key="wake_when_plugged_or_unplugged" - android:title="@string/wake_when_plugged_or_unplugged_title" - android:summary="@string/wake_when_plugged_or_unplugged_summary" - android:defaultValue="false" /> - - <SwitchPreference - android:key="adaptive_backlight" - android:title="@string/adaptive_backlight_title" - android:summary="@string/adaptive_backlight_summary" - android:defaultValue="true" /> - </PreferenceCategory> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml new file mode 100644 index 0000000..51bcafa --- /dev/null +++ b/res/xml/notification_manager_settings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod Project + + 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"> + <!-- Zen Mode --> + <PreferenceScreen + android:key="zen_mode" + android:title="@string/zen_mode_settings_title" + android:fragment="com.android.settings.notification.ZenModeSettings" /> + + <!-- When device is locked --> + <com.android.settings.DropDownPreference + android:key="lock_screen_notifications" + android:title="@string/lock_screen_notifications_title" + android:persistent="false" /> + + <!-- App notifications --> + <PreferenceScreen + android:key="app_notifications" + android:title="@string/app_notifications_title" + android:fragment="com.android.settings.notification.NotificationAppList" /> + + <!-- Notification access --> + <Preference + android:key="manage_notification_access" + android:title="@string/manage_notification_access_title" + android:persistent="false" + android:fragment="com.android.settings.notification.NotificationAccessSettings" /> + + <!-- Filter notifications --> + <PreferenceScreen + android:title="@string/block_notifications_title" + android:summary="@string/block_notifications_summary" + android:fragment="com.android.settings.cyanogenmod.SpamList" /> + +</PreferenceScreen> diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml index 834c1ff..3ba3dfb 100644 --- a/res/xml/other_sound_settings.xml +++ b/res/xml/other_sound_settings.xml @@ -43,14 +43,6 @@ android:title="@string/docking_sounds_title" android:persistent="false" /> - <!-- Volume adjust sounds --> - <SwitchPreference - android:key="volume_adjust_sounds" - android:title="@string/volume_adjust_sounds_title" - android:switchTextOff="" - android:switchTextOn="" - android:persistent="false" /> - <!-- Touch sounds --> <SwitchPreference android:key="touch_sounds" @@ -59,15 +51,8 @@ <!-- Vibrate on touch --> <SwitchPreference - android:key="vibrate_on_touch" - android:title="@string/vibrate_on_touch_title" - android:persistent="false" /> - - <!-- CMHW vibration intensity --> - <com.android.settings.hardware.VibratorIntensity - android:key="vibration_intensity" - android:title="@string/vibrator_intensity_title" - android:dialogTitle="@string/vibrator_intensity_title" + android:key="volume_adjust_sounds" + android:title="@string/volume_adjust_sounds_title" android:persistent="false" /> <!-- Dock speaker plays --> @@ -83,7 +68,7 @@ android:persistent="false" /> <PreferenceCategory - android:title="@string/power_notifications_category_title"/> + android:title="@string/power_notifications_category_title"> <SwitchPreference android:key="power_notifications" @@ -105,4 +90,5 @@ android:dependency="power_notifications" android:persistent="false" /> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/privacy_settings_cyanogenmod.xml b/res/xml/privacy_settings_cyanogenmod.xml index 310e74b..65e8198 100644 --- a/res/xml/privacy_settings_cyanogenmod.xml +++ b/res/xml/privacy_settings_cyanogenmod.xml @@ -29,11 +29,6 @@ android:summary="@string/blacklist_summary" android:fragment="com.android.settings.blacklist.BlacklistSettings" /> - <PreferenceScreen - android:title="@string/block_notifications_title" - android:summary="@string/block_notifications_summary" - android:fragment="com.android.settings.cyanogenmod.SpamList" /> - <!-- Anonymous statistics - (CMStats) --> <PreferenceScreen android:key="cmstats" diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml index 46340f2..7e23992 100644 --- a/res/xml/security_settings_chooser.xml +++ b/res/xml/security_settings_chooser.xml @@ -27,6 +27,12 @@ android:summary="@string/unlock_set_unlock_mode_none" android:persistent="false"/> + </PreferenceCategory> + + <PreferenceCategory + android:key="general_category" + android:title="@string/title_general"> + <com.android.settings.SingleLineSummaryPreference android:key="owner_info_settings" android:title="@string/owner_info_settings_title" diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml index fde0446..d0f3e55 100644 --- a/res/xml/security_settings_lockscreen.xml +++ b/res/xml/security_settings_lockscreen.xml @@ -29,12 +29,26 @@ settings:keywords="@string/keywords_lockscreen" android:persistent="false"/> + </PreferenceCategory> + + <PreferenceCategory + android:key="general_category" + android:title="@string/title_general"> + <com.android.settings.SingleLineSummaryPreference android:key="owner_info_settings" android:enabled="false" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> + <PreferenceScreen + android:key="lockscreen_shortcuts_settings" + android:title="@string/lockscreen_targets_message" > + <intent + android:targetPackage="com.android.systemui" + android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 21f4477..58876ba 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -17,6 +17,15 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/security_settings_title"> + <PreferenceCategory android:title="@string/security_passwords_title" + android:persistent="false"> + + <SwitchPreference android:key="show_password" + android:title="@string/show_password" + android:persistent="false"/> + + </PreferenceCategory> + <PreferenceCategory android:key="sim_lock" android:title="@string/sim_lock_settings_title" android:persistent="false"> @@ -33,29 +42,6 @@ </PreferenceCategory> - <PreferenceCategory - android:key="app_security" - android:title="@string/app_security_title"> - - <ListPreference - android:key="sms_security_check_limit" - android:dialogTitle="@string/sms_security_check_limit_title" - android:title="@string/sms_security_check_limit_title" - android:entries="@array/sms_security_check_limit_entries" - android:entryValues="@array/sms_security_check_limit_values" - android:defaultValue="30" /> - - </PreferenceCategory> - - <PreferenceCategory android:title="@string/security_passwords_title" - android:persistent="false"> - - <SwitchPreference android:key="show_password" - android:title="@string/show_password" - android:persistent="false"/> - - </PreferenceCategory> - <PreferenceCategory android:key="device_admin_category" android:title="@string/device_admin_title" android:persistent="false"> @@ -113,15 +99,17 @@ </PreferenceCategory> - <PreferenceCategory android:key="advanced_security" - android:title="@string/advanced_security_title" + <PreferenceCategory android:key="advanced" + android:title="@string/category_misc" android:persistent="false"> - <Preference android:key="manage_trust_agents" - android:title="@string/manage_trust_agents" - android:summary="@string/manage_trust_agents_summary" - android:persistent="false" - android:fragment="com.android.settings.TrustAgentSettings"/> + <ListPreference + android:key="sms_security_check_limit" + android:dialogTitle="@string/sms_security_check_limit_title" + android:title="@string/sms_security_check_limit_title" + android:entries="@array/sms_security_check_limit_entries" + android:entryValues="@array/sms_security_check_limit_values" + android:defaultValue="30" /> <PreferenceScreen android:key="screen_pinning_settings" diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml index 7587af8..c073fe0 100644 --- a/res/xml/security_settings_password.xml +++ b/res/xml/security_settings_password.xml @@ -29,12 +29,11 @@ settings:keywords="@string/keywords_lockscreen" android:persistent="false"/> - <PreferenceScreen - android:title="@string/lockscreen_targets_message" > - <intent - android:targetPackage="com.android.systemui" - android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> - </PreferenceScreen> + </PreferenceCategory> + + <PreferenceCategory + android:key="general_category" + android:title="@string/title_general"> <ListPreference android:key="lock_after_timeout" @@ -53,6 +52,20 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> + <PreferenceScreen + android:key="lockscreen_shortcuts_settings" + android:title="@string/lockscreen_targets_message" > + <intent + android:targetPackage="com.android.systemui" + android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> + </PreferenceScreen> + + <Preference android:key="manage_trust_agents" + android:title="@string/manage_trust_agents" + android:summary="@string/manage_trust_agents_summary" + android:persistent="false" + android:fragment="com.android.settings.TrustAgentSettings"/> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml index b82b149..968efc5 100644 --- a/res/xml/security_settings_pattern.xml +++ b/res/xml/security_settings_pattern.xml @@ -29,12 +29,11 @@ settings:keywords="@string/keywords_lockscreen" android:persistent="false"/> - <PreferenceScreen - android:title="@string/lockscreen_targets_message" > - <intent - android:targetPackage="com.android.systemui" - android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> - </PreferenceScreen> + </PreferenceCategory> + + <PreferenceCategory + android:key="general_category" + android:title="@string/title_general"> <SwitchPreference android:key="visiblepattern" @@ -57,6 +56,20 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> + <PreferenceScreen + android:key="lockscreen_shortcuts_settings" + android:title="@string/lockscreen_targets_message" > + <intent + android:targetPackage="com.android.systemui" + android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> + </PreferenceScreen> + + <Preference android:key="manage_trust_agents" + android:title="@string/manage_trust_agents" + android:summary="@string/manage_trust_agents_summary" + android:persistent="false" + android:fragment="com.android.settings.TrustAgentSettings" /> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml index 6629f28..9a29ad5 100644 --- a/res/xml/security_settings_pin.xml +++ b/res/xml/security_settings_pin.xml @@ -29,10 +29,11 @@ settings:keywords="@string/keywords_lockscreen" android:persistent="false"/> - <PreferenceScreen - android:key="lockscreen_shortcuts_settings" - android:fragment="com.android.settings.cyanogenmod.LockscreenShortcuts" - android:title="@string/lockscreen_targets_message" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="general_category" + android:title="@string/title_general"> <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference android:key="lockscreen_scramble_pin_layout" @@ -56,6 +57,20 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> + <PreferenceScreen + android:key="lockscreen_shortcuts_settings" + android:title="@string/lockscreen_targets_message" > + <intent + android:targetPackage="com.android.systemui" + android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" /> + </PreferenceScreen> + + <Preference android:key="manage_trust_agents" + android:title="@string/manage_trust_agents" + android:summary="@string/manage_trust_agents_summary" + android:persistent="false" + android:fragment="com.android.settings.TrustAgentSettings"/> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/sounds.xml b/res/xml/sounds.xml new file mode 100644 index 0000000..fe07526 --- /dev/null +++ b/res/xml/sounds.xml @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod Project + + 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" + android:title="@string/sound_settings" + android:key="sound_settings"> + + <PreferenceCategory + android:key="volumes" + android:title="@string/category_volume" > + + <!-- Ring volume --> + <com.android.settings.notification.VolumeSeekBarPreference + android:key="ring_volume" + android:icon="@*android:drawable/ic_audio_ring_notif" + android:title="@string/ring_volume_option_title" /> + + <!-- Media volume --> + <com.android.settings.notification.VolumeSeekBarPreference + android:key="media_volume" + android:icon="@*android:drawable/ic_audio_vol" + android:title="@string/media_volume_option_title" /> + + <!-- Alarm volume --> + <com.android.settings.notification.VolumeSeekBarPreference + android:key="alarm_volume" + android:icon="@*android:drawable/ic_audio_alarm" + android:title="@string/alarm_volume_option_title" /> + + <!-- Notification volume --> + <com.android.settings.notification.VolumeSeekBarPreference + android:key="notification_volume" + android:icon="@*android:drawable/ic_audio_ring_notif" + android:title="@string/notification_volume_option_title"/> + </PreferenceCategory> + + <PreferenceCategory + android:key="sounds" + android:title="@string/category_sounds"> + + <!-- Phone ringtone --> + <com.android.settings.DefaultRingtonePreference + android:key="ringtone" + android:title="@string/ringtone_title" + android:dialogTitle="@string/ringtone_title" + android:persistent="false" + android:ringtoneType="ringtone" /> + + <!-- Default notification ringtone --> + <com.android.settings.DefaultRingtonePreference + android:key="notification_ringtone" + android:title="@string/notification_ringtone_title_cm" + android:dialogTitle="@string/notification_ringtone_title_cm" + android:persistent="false" + android:ringtoneType="notification" /> + + <!-- Increasing ring --> + <com.android.settings.cyanogenmod.SystemSettingSwitchPreference + android:key="increasing_ring" + android:title="@string/increasing_ring_volume_option_title" /> + + <!-- Increasing ring volume --> + <com.android.settings.notification.IncreasingRingVolumePreference + android:key="increasing_ring_volume" + android:icon="@drawable/ring_notif_increasing" + android:dependency="increasing_ring"/> + + <!-- Other sounds --> + <Preference + android:key="other_sounds" + android:title="@string/other_sound_settings" + android:persistent="false" + android:fragment="com.android.settings.notification.OtherSoundSettings" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="vibrate" + android:title="@string/category_vibrate"> + + <!-- Also vibrate for calls --> + <SwitchPreference + android:key="vibrate_when_ringing" + android:title="@string/vibrate_when_ringing_title" + android:persistent="false" /> + + <!-- Vibrate on touch --> + <SwitchPreference + android:key="vibrate_on_touch" + android:title="@string/vibrate_on_touch_title" + android:switchTextOff="" + android:switchTextOn="" + android:persistent="false" /> + + <!-- CMHW vibration intensity --> + <com.android.settings.hardware.VibratorIntensity + android:key="vibration_intensity" + android:title="@string/vibrator_intensity_title" + android:dialogTitle="@string/vibrator_intensity_title" + android:persistent="false"/> + </PreferenceCategory> +</PreferenceScreen> diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index 7a70306..2f67dc4 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -17,11 +17,6 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <SwitchPreference - android:key="usb_tether_settings" - android:title="@string/usb_tethering_button_text" - android:persistent="false" /> - - <SwitchPreference android:key="enable_wifi_ap" android:title="@string/wifi_tether_checkbox_text" android:persistent="false" /> @@ -32,6 +27,11 @@ android:persistent="false" /> <SwitchPreference + android:key="usb_tether_settings" + android:title="@string/usb_tethering_button_text" + android:persistent="false" /> + + <SwitchPreference android:key="enable_bluetooth_tethering" android:title="@string/bluetooth_tether_checkbox_text" android:persistent="false" /> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 4a3741e..fdb5286 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -29,6 +29,11 @@ android:title="@string/wifi_calling_settings_title" settings:keywords="@string/keywords_wifi_calling" android:fragment="com.android.settings.WifiCallingSettings" /> + + <PreferenceScreen + android:key="nfc_payment_settings" + android:title="@string/nfc_payment_settings_title" + android:fragment="com.android.settings.nfc.PaymentSettings" /> <PreferenceScreen android:fragment="com.android.settings.TetherSettings" |
