Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0

7 files changed, 279 insertions, 123 deletions

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 21bcedc..57375d9 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -30,18 +30,14 @@
         <item>3</item>
     </string-array>
 
-    <!-- Profile mode options. -->
-    <string-array name="profile_entries">
-        <item>On</item>
-        <item>Off</item>
-        <item>No override</item>
+    <string-array name="root_access_entries_adb" translatable="false">
+        <item>@string/root_access_none</item>
+        <item>@string/root_access_adb</item>
     </string-array>
 
-    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-    <string-array name="profile_values" translatable="false">
-        <item>OVERRIDE</item>
-        <item>SUPPRESS</item>
-        <item>DEFAULT</item>
+    <string-array name="root_access_values_adb" translatable="false">
+        <item>0</item>
+        <item>2</item>
     </string-array>
 
     <!-- Profile lock mode summaries. Do not translate. -->
@@ -98,18 +94,12 @@
         <item>2</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_entries">
+    <string-array name="profile_action_generic_connection_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_disable</item>
         <item>@string/profile_action_enable</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
     <string-array name="profile_doze_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_enable</item>
@@ -123,23 +113,17 @@
     </string-array>
 
     <!-- Profile mode options. -->
-     <string-array name="profile_entries" translatable="false">
-         <item>@string/profile_entries_on</item>
-         <item>@string/profile_entries_off</item>
-         <item>@string/profile_entries_no_override</item>
-     </string-array>
-
-     <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-     <string-array name="profile_values" translatable="false">
-         <item>OVERRIDE</item>
-         <item>SUPPRESS</item>
-         <item>DEFAULT</item>
-     </string-array>
+    <string-array name="profile_entries" translatable="false">
+        <item>@string/profile_entries_on</item>
+        <item>@string/profile_entries_off</item>
+        <item>@string/profile_entries_no_override</item>
+    </string-array>
 
-    <string-array name="trigger_page_title">
-        <item>WiFi</item>
-        <item>Bluetooth</item>
-        <item>NFC</item>
+    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
+    <string-array name="profile_values" translatable="false">
+        <item>OVERRIDE</item>
+        <item>SUPPRESS</item>
+        <item>DEFAULT</item>
     </string-array>
 
     <!-- Values for the notification light pulse spinners -->
@@ -348,7 +332,7 @@
     </string-array>
 
     <!-- App ops permissions -->
-    <string-array name="app_ops_permissions">
+    <string-array name="app_ops_permissions" translatable="false">
         <item>@string/app_ops_permissions_allowed</item>
         <item>@string/app_ops_permissions_ignored</item>
         <item>@string/app_ops_permissions_always_ask</item>
@@ -376,18 +360,6 @@
         <item>silent</item>
     </string-array>
 
-    <!-- Gamma calibration descriptors, deliberately empty as string values populated via
-         per-device overlay. Required to build on non-hardware tunable devices -->
-    <string-array name="gamma_descriptors" translatable="false">
-    </string-array>
-
-    <!-- Values for screen color  -->
-    <string-array name="screen_color_setting">
-        <item>Standard</item>
-        <item>Vivid</item>
-        <item>Custom</item>
-    </string-array>
-
     <!-- Stylus Gestures -->
     <string-array name="gestures_entries" translatable="false">
         <item>@string/gestures_action_empty</item>
@@ -533,19 +505,19 @@
     </string-array>
 
     <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi region code. -->
-    <string-array name="wifi_countrycode_entries">
-        <item>United States</item>
-        <item>Canada, Taiwan</item>
-        <item>Germany</item>
-        <item>Europe</item>
-        <item>Japan, Russia</item>
-        <item>Australia</item>
-        <item>China</item>
-        <item>Korea</item>
-        <item>South Africa, Turkey</item>
-        <item>Israel, Singapore</item>
-        <item>Brazil</item>
-        <item>India</item>
+    <string-array name="wifi_countrycode_entries" translatable="false">
+        <item>@string/wifi_countrycode_us</item>
+        <item>@string/wifi_countrycode_ca</item>
+        <item>@string/wifi_countrycode_de</item>
+        <item>@string/wifi_countrycode_gb</item>
+        <item>@string/wifi_countrycode_jp</item>
+        <item>@string/wifi_countrycode_au</item>
+        <item>@string/wifi_countrycode_cn</item>
+        <item>@string/wifi_countrycode_kr</item>
+        <item>@string/wifi_countrycode_tr</item>
+        <item>@string/wifi_countrycode_sg</item>
+        <item>@string/wifi_countrycode_br</item>
+        <item>@string/wifi_countrycode_in</item>
     </string-array>
 
     <string-array name="wifi_countrycode_values" translatable="false">
@@ -591,4 +563,51 @@
         <item>600000</item>
     </string-array>
 
+    <string-array name="background_data_access_choices" translatable="false">
+        <item>@string/allow_background_both</item>
+        <item>@string/allow_background_wlan</item>
+        <item>@string/allow_background_none</item>
+    </string-array>
+
+    <!-- Weather temperature -->
+    <string-array name="weather_temp_unit_entries" translatable="false">
+        <item>@string/weather_settings_temp_celsius</item>
+        <item>@string/weather_settings_temp_fahrenheit</item>
+    </string-array>
+
+    <string-array name="weather_temp_unit_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Fingerprint sensor locations.  Devices should configure their sensor location using
+         config_fingerprintSensorLocation -->
+    <string-array name="security_settings_fingerprint_sensor_locations" translatable="false">
+        <item>@string/security_settings_fingerprint_sensor_location_back</item>
+        <item>@string/security_settings_fingerprint_sensor_location_front</item>
+        <item>@string/security_settings_fingerprint_sensor_location_left</item>
+        <item>@string/security_settings_fingerprint_sensor_location_right</item>
+    </string-array>
+
+    <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+    <string-array name="app_notification_sound_timeout_entries" translatable="false">
+        <item>@string/app_notification_sound_timeout_value_none</item>
+        <item>@string/app_notification_sound_timeout_value_10_seconds</item>
+        <item>@string/app_notification_sound_timeout_value_30_seconds</item>
+        <item>@string/app_notification_sound_timeout_value_1_minute</item>
+        <item>@string/app_notification_sound_timeout_value_5_minutes</item>
+        <item>@string/app_notification_sound_timeout_value_15_minutes</item>
+        <item>@string/app_notification_sound_timeout_value_30_minutes</item>
+    </string-array>
+
+    <!-- Do not translate. -->
+    <string-array name="app_notification_sound_timeout_values" translatable="false">
+        <item>0</item>
+        <item>10000</item>
+        <item>30000</item>
+        <item>60000</item>
+        <item>300000</item>
+        <item>900000</item>
+        <item>1800000</item>
+    </string-array>
 </resources>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 8fa69de..3492078 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -18,7 +18,6 @@ limitations under the License.
     <color name="floating_action_button_touch_tint">#80ffffff</color>
     <color name="theme_accent">#ff009688</color>
 
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
 
     <drawable name="expanded_item_bg_activated">#ffEEEEEE</drawable>
@@ -63,7 +62,6 @@ limitations under the License.
 
     <!-- Personal Dictionary Add Icon -->
     <drawable name="ic_menu_add_word">@drawable/ic_menu_add_dark</drawable>
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
     <!-- NFC hard colors -->
     <color name="nfc_how_it_works_main_background">#FF80CBC4</color>
@@ -120,11 +118,10 @@ limitations under the License.
 
     <color name="storage_wizard_button_text_color">@color/text_color_white</color>
     <color name="storage_wizard_red_button_text_color">@color/text_color_white</color>
-    <color name="screen_color_button_text_color">@color/text_color_white</color>
     <color name="privacy_guard_error_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_status_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_lock_pattern_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_emergency_button_text_color">@color/text_color_white</color>
-    <color name="custom_screencolor_buttons_text_color">@color/text_color_white</color>
 
+    <color name="weather_settings_icon_tint">#B4B9BA</color>
 </resources>
diff --git a/res/values/cm_drawables.xml b/res/values/cm_drawables.xml
new file mode 100644
index 0000000..f9c5f45
--- /dev/null
+++ b/res/values/cm_drawables.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 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.
+-->
+<resources>
+
+    <!-- Default Bluetooth icon for subsettings -->
+    <drawable name="ic_bt_bluetooth">@drawable/ic_settings_bluetooth</drawable>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8b34535..7fa4160 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -15,6 +15,18 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+    <plurals name="show_device_id_countdown_cm">
+        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from querying Device ID.</item>
+        <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from querying Device ID.</item>
+    </plurals>
+    <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+    <string name="show_device_id_copied_cm">Device ID:[<xliff:g id="device_id">%1$s</xliff:g>] copied to clipboard</string>
+    <!--  Device Info screen. Confirmation that Device ID is not available -->
+    <string name="show_device_id_failed_cm">Device ID is not available on this build</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+    <string name="show_device_id_clipboard_label">Device ID</string>
+
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <plurals name="show_dev_countdown_cm">
         <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
@@ -41,6 +53,10 @@
     <string name="root_access_adb">ADB only</string>
     <string name="root_access_all">Apps and ADB</string>
 
+    <!-- Preference link for root appops -->
+    <string name="root_appops_title">Manage root accesses</string>
+    <string name="root_appops_summary">View and control the root rules</string>
+
     <!-- NFC PreferenceCategory title -->
     <string name="nfc_title_category">NFC</string>
 
@@ -207,6 +223,19 @@
     <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
     <string name="wifi_setting_countrycode_error">There was a problem setting the region code.</string>
 
+    <string name="wifi_countrycode_us">United States</string>
+    <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+    <string name="wifi_countrycode_de">Germany</string>
+    <string name="wifi_countrycode_gb">Europe</string>
+    <string name="wifi_countrycode_jp">Japan, Russia</string>
+    <string name="wifi_countrycode_au">Australia</string>
+    <string name="wifi_countrycode_cn">China</string>
+    <string name="wifi_countrycode_kr">Korea</string>
+    <string name="wifi_countrycode_tr">South Africa, Turkey</string>
+    <string name="wifi_countrycode_sg">Israel, Singapore</string>
+    <string name="wifi_countrycode_br">Brazil</string>
+    <string name="wifi_countrycode_in">India</string>
+
     <!-- Profiles -->
     <string name="profile_menu_delete_title">Delete</string>
     <string name="profile_action_none">Leave unchanged</string>
@@ -310,6 +339,7 @@
     <!-- Lights settings, LED notification -->
     <string name="led_notification_title">Light settings</string>
     <string name="led_notification_text">LED light enabled by settings</string>
+    <string name="notification_light_no_apps_summary">To add per app control, activate \'%1$s\' and press \'\u002b\' on the menu bar</string>
 
     <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
     <string name="enable_adb_cm">Android debugging</string>
@@ -487,6 +517,7 @@
     <string name="app_ops_allowed_count">Allowed <xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_ignored_count">Denied <xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_both_count">Allowed <xliff:g id="count">%1$s</xliff:g>, denied <xliff:g id="count">%2$s</xliff:g></string>
+    <string name="app_ops_disabled_by_optimization">Disabled by battery optimization</string>
 
     <!-- App ops menu options -->
     <string name="app_ops_show_user_apps">Show user apps</string>
@@ -586,13 +617,17 @@
     <string name="disable_navkeys_title">Enable on-screen nav bar</string>
     <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string>
 
+    <!-- tap-to-wake -->
+    <string name="double_tap_to_wake_title">Double-tap to wake</string>
+    <string name="double_tap_to_wake_summary">Double-tap on the screen to turn on the display</string>
+
     <!-- tap-to-sleep -->
     <string name="double_tap_to_sleep_title">Double-tap to sleep</string>
     <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
 
     <!-- Proximity wake -->
     <string name="proximity_wake_title">Prevent accidental wake-up</string>
-    <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>
+    <string name="proximity_wake_summary">Check the proximity sensor prior to wake-ups triggered by gestures</string>
 
     <!-- Turn on display when power connected; turn off display when power disconnected -->
     <string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
@@ -607,7 +642,7 @@
 
     <!-- Hardware tunables - Vibrator intensity -->
     <string name="vibrator_intensity_title">Vibrator intensity</string>
-    <string name="vibrator_warning">Values higher than %1$d are not recommended</string>
+    <string name="vibrator_warning">Values higher than %1$d%% are not recommended</string>
 
     <!-- Hardware tunables - Color calibration -->
     <string name="color_calibration_title">Color calibration</string>
@@ -616,13 +651,6 @@
     <string name="color_green_title">Green</string>
     <string name="color_blue_title">Blue</string>
 
-    <!-- Hardware tunables - Gamma calibration -->
-    <string name="gamma_tuning_title_head">Gamma calibration</string>
-    <string name="gamma_tuning_summary_head">Tweak gamma values</string>
-    <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay -->
-    <string name="gamma_tuning_contrast">Contrast</string>
-    <string name="gamma_tuning_brightness">Brightness</string>
-    <string name="gamma_tuning_saturation">Saturation</string>
 
     <!-- Launch music player when headset is connected -->
     <string name="headset_connect_player_title">Launch music app</string>
@@ -644,21 +672,6 @@
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
 
-    <!-- Display settings.  Screen color. -->
-    <string name="screencolor">Screen color</string>
-    <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-    <string name="custom_screencolor">Custom screen color</string>
-    <string name="screencolor_save">Save</string>
-    <string name="screencolor_cancel">Cancel</string>
-    <string name="restore_preview">View default picture</string>
-    <string name="selectnewfile_menu">View new picture from Gallery</string>
-    <string name="selectfile_menu">View picture from Gallery</string>
-    <string name="restore_default_str">Reset</string>
-    <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string>
-    <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-    <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-    <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-
     <!-- LiveDisplay -->
     <string name="live_display_title" translatable="false">LiveDisplay</string>
     <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
@@ -689,6 +702,16 @@
     <string name="live_display_color_profile_photography_summary">Perfect color reproduction for photos</string>
     <string name="live_display_color_profile_basic_title">Basic</string>
     <string name="live_display_color_profile_basic_summary">Use the display uncalibrated</string>
+    <string name="live_display_color_profile_adaptive_title">Adaptive</string>
+    <string name="live_display_color_profile_adaptive_summary">Colors adapt to ambient conditions</string>
+
+    <!-- LiveDisplay : Picture Adjustment -->
+    <string name="picture_adjustment_title">Picture adjustment</string>
+    <string name="picture_adjustment_summary">Adjust hue, saturation, intensity, and contrast</string>
+    <string name="adj_hue_title">Hue</string>
+    <string name="adj_saturation_title">Saturation</string>
+    <string name="adj_intensity_title">Intensity</string>
+	<string name="adj_contrast_title">Contrast</string>
 
     <!-- Whether to display IME switcher notifcation -->
     <string name="ime_switcher_notify">Selector icon</string>
@@ -1000,7 +1023,7 @@
     <string name="menu_hidden_apps_delete">Reset</string>
     <string name="menu_hidden_apps_reset_lock">Reset pattern lock</string>
     <string name="protected_apps">Protected apps</string>
-    <string name="protected_apps_summary">Manage which applications are hidden behind a secure lock</string>
+    <string name="protected_apps_summary">Manage which apps are hidden behind a secure lock</string>
     <string name="saving_protected_components">Saving component state\u2026</string>
 
     <string name="pa_login_username_hint">Username (email)</string>
@@ -1080,6 +1103,12 @@
     <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
     <string name="zen_mode_summary_selected_messages">selected messages</string>
 
+    <!-- Allow vibration in zen mode -->
+    <string name="zen_mode_vibration">Vibration</string>
+    <string name="zen_mode_vibration_never">Don\'t vibrate</string>
+    <string name="zen_mode_vibration_calls_only">Only vibrate for calls</string>
+    <string name="zen_mode_vibration_calls_and_notifications">Vibrate for calls and notifications</string>
+
     <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
     <string name="regulatory_information_dialog_title" translatable="false">@string/regulatory_information</string>
 
@@ -1156,4 +1185,102 @@
     <string name="battery_info_status_charging_dock_ac">Charging on dock AC</string>
     <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
     <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
+
+    <string name="restrict_app_wlan_title">Disable app Wi\u2011Fi usage</string>
+    <string name="restrict_app_wlan_summary">Prevent app from using Wi\u2011Fi data connection</string>
+    <string name="restrict_app_cellular_title">Disable app cellular usage</string>
+    <string name="restrict_app_cellular_summary">Prevent app from using cellular data connection</string>
+    <string name="privacy_guard_internet_category">Internet</string>
+
+    <!-- Weather -->
+    <string name="weather_settings_title">Weather</string>
+    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
+    <string name="weather_settings_button">Provider settings</string>
+    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
+    <string name="weather_settings_add_weather_provider">Add weather provider</string>
+    <string name="weather_settings_play_store_market_url" translatable="false">market://search?q=cyanogenmodweatherprovider&amp;c=apps</string>
+    <string name="weather_settings_play_store_http_url" translatable="false">http://play.google.com/store/search?q=cyanogenmodweatherprovider&amp;c=apps</string>
+    <string name="weather_settings_general_settings_title">General</string>
+    <string name="weather_settings_providers_title">Providers</string>
+    <string name="weather_settings_temp_units_title">Temperature unit</string>
+    <string name="weather_settings_temp_celsius">Celsius</string>
+    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+    <string name="weather_settings_keyword">weather</string>
+
+    <string name="background_data_access">Background data access</string>
+    <string name="allow_background_both">Over cellular data &amp; Wi\u2011Fi</string>
+    <string name="allow_background_wlan">Only over Wi\u2011Fi</string>
+    <string name="allow_background_none">No access</string>
+    <string name="mobile_data_alert">Cellular data alert</string>
+    <string name="mobile_data_alert_summary">Notify when the app uses a significant amount of data</string>
+    <string name="data_usage_menu_enable_data_alerts">Enable data usage alerts</string>
+    <string name="data_usage_menu_disable_data_alerts">Disable data usage alerts</string>
+    <string name="data_usage_menu_reset_stats">Reset data statistics</string>
+    <string name="reset_data_stats_msg">This will clear all past and present data tracking information</string>
+    <string name="reset_stats_confirm">Confirm</string>
+
+    <string name="restrict_cellular_access_title">Restrict cellular data access</string>
+    <string name="restrict_cellular_access_summary">Disable data access on cellular networks</string>
+    <string name="restrict_cellular_access_dialog_title">Restrict cellular data access?</string>
+    <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only cellular networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
+
+    <!-- Label for settings shortcut: carrier selection -->
+    <string name="shortcut_carrier_title">Network operators</string>
+
+    <!-- title for lock screen blur preference -->
+    <string name="lockscreen_blur_enabled_title">Blur background</string>
+    <!-- title for lock screen weather preference -->
+    <string name="lockscreen_weather_enabled_title">Show weather</string>
+
+    <!-- Per app controls for LP keyguard notifications -->
+    <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
+    <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
+
+    <!-- Notification sound timeout -->
+    <string name="app_notification_sound_timeout_title">Minimum time between notification sounds</string>
+    <string name="app_notification_sound_timeout_summary_template">Allow sounds or vibration no more than once every <xliff:g id="duration">%1$s</xliff:g></string>
+    <string name="app_notification_sound_timeout_value_none">No restriction</string>
+    <string name="app_notification_sound_timeout_value_10_seconds">10 seconds</string>
+    <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
+    <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
+    <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>
+    <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
+
+    <!-- CmRadioInfo -->
+    <string name="cm_radio_info_label">Enhanced radio control</string>
+
+    <!-- Radio Control (IMS/MBN etc.) -->
+    <string name="cm_radio_info_mbn_auto_load_on_label">Turn off MBN auto load</string>
+    <string name="cm_radio_info_mbn_auto_load_off_label">Turn on MBN auto load</string>
+    <string name="cm_radio_info_volte_avail_ovr_on_label">Turn off VoLTE debug</string>
+    <string name="cm_radio_info_volte_avail_ovr_off_label">Turn on VoLTE debug</string>
+    <string name="cm_radio_info_vt_avail_ovr_on_label">Turn off VT debug</string>
+    <string name="cm_radio_info_vt_avail_ovr_off_label">Turn on VT debug</string>
+    <string name="cm_radio_info_wfc_avail_ovr_on_label">Turn off WFC debug</string>
+    <string name="cm_radio_info_wfc_avail_ovr_off_label">Turn on WFC debug</string>
+    <string name="cm_radio_info_adb_log_on_label">Turn off ADB radio log</string>
+    <string name="cm_radio_info_adb_log_off_label">Turn on ADB radio log</string>
+    <string name="cm_radio_info_diag_log_on_label">Turn off Diag log</string>
+    <string name="cm_radio_info_diag_log_off_label">Turn on Diag log</string>
+
+    <!-- Lock screen wallpaper -->
+    <string name="lockscreen_wallpaper_title">Wallpaper</string>
+
+    <string name="not_available_with_app">Not available with %1$s</string>
+    <string name="blacklist_country_code_plus" translatable="false">+</string>
+
+    <!-- Format string for fingerprint location message -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Locate the fingerprint sensor on the <xliff:g id="sensor_location">%1$s</xliff:g> of your phone.</string>
+
+    <!-- Fingerprint sensor locations -->
+    <string name="security_settings_fingerprint_sensor_location_back">back</string>
+    <string name="security_settings_fingerprint_sensor_location_front">front</string>
+    <string name="security_settings_fingerprint_sensor_location_left">left side</string>
+    <string name="security_settings_fingerprint_sensor_location_right">right side</string>
+
+    <!-- SIM status format string -->
+    <string name="sim_status_format_string">Voice: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 35622cf..1761232 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -50,41 +50,6 @@
     <!-- Config to enable duplicate APN checking. When true, disallows adding new duplicate APNs -->
     <bool name="config_enable_duplicate_apn_checking">false</bool>
 
-    <!-- This used to define screen color's Hue progress bar minimum value -->
-    <integer name="minimum_hue_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's Hue progress bar maximum value-->
-    <integer name="maximum_hue_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's Hue progress bar default value-->
-    <integer name="default_hue_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's saturation progress bar minimum value-->
-    <integer name="minimum_saturation_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's saturation progress bar maximum value-->
-    <integer name="maximum_saturation_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's saturation progress bar default value-->
-    <integer name="default_saturation_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's intensity progress bar minimum value-->
-    <integer name="minimum_intensity_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's intensity progress bar maximum value-->
-    <integer name="maximum_intensity_value" translatable="false">400</integer>
-
-    <!-- This is used to define screen color's intensity progress bar default value-->
-    <integer name="default_intensity_value" translatable="false">200</integer>
-
-    <!-- This is used to define screen color's contrast progress bar minimum value-->
-    <integer name="minimum_contrast_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's contrast progress bar default value-->
-    <integer name="default_contrast_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's contrast progress bar maximum value-->
-    <integer name="maximum_contrast_value" translatable="false">360</integer>
 
     <!-- Display ro.product.name above Device model -->
     <bool name="config_displayDeviceName">false</bool>
@@ -112,4 +77,27 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
+    <!-- When true Live lock screen settings will be positioned at the top -->
+    <bool name="config_showLiveLockScreenSettingsFirst">false</bool>
+
+    <!-- When true, weather options will be displayed in settings dashboard -->
+    <bool name="config_showWeatherMenu">true</bool>
+
+    <!-- When true, "show built-in" option in Privacy Guard will be available -->
+    <bool name="config_showBuiltInAppsForPG">true</bool>
+
+    <!-- Defines the location of the fingerprint sensor on the device
+         0 = back
+         1 = front
+         2 = left side
+         3 = right side
+    -->
+    <integer name="config_fingerprintSensorLocation">0</integer>
+
+    <!-- Does the device allow for manual subscription provisioning? Only works for multi-sim devices,
+         and currently depends on QC's proprietary telephony stack -->
+    <bool name="config_enableManualSubProvisioning">true</bool>
+
+    <!-- Does the device allow updating the recovery. -->
+    <bool name="config_enableRecoveryUpdater">true</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 67d77b6..f94131c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -269,4 +269,6 @@
     <dimen name="fab_icon_size">24dp</dimen>
     <dimen name="fab_elevation_normal">8dp</dimen>
     <dimen name="fab_elevation_pressed">6dp</dimen>
+
+    <dimen name="storage_decor_padding_top">0dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3581f2..dfff31f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -356,6 +356,7 @@
 
     <style name="SetupWizardStorageStyle" parent="@style/SuwThemeMaterial.Light">
         <item name="android:colorAccent">#ff009688</item>
+        <item name="suwDecorPaddingTop">@dimen/storage_decor_padding_top</item>
     </style>
 
     <style name="ProfilesPreferenceStyle">