Cherish: Setup default lockscreen customization values [2/2]

Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

res/layout/app_list_item.xml

@@ -25,11 +25,11 @@
         android:id="@+id/icon"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginVertical="4dp"
         android:scaleType="centerInside"
         settings:layout_constraintStart_toStartOf="parent"
-        settings:layout_constraintTop_toTopOf="parent" />
+        settings:layout_constraintTop_toTopOf="parent"
+        settings:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/label"
@@ -38,23 +38,26 @@
         android:layout_marginStart="@dimen/default_margin"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?android:attr/textColorPrimary"
+        android:maxLines="1"
         settings:layout_constraintStart_toEndOf="@id/icon"
-        settings:layout_constraintEnd_toStartOf="@id/checkBox"
-        settings:layout_constraintTop_toTopOf="@id/icon" />
+        settings:layout_constraintEnd_toStartOf="@id/check_box"
+        settings:layout_constraintTop_toTopOf="@id/icon"
+        settings:layout_constraintBottom_toTopOf="@id/package_name" />
 
     <TextView
-        android:id="@+id/packageName"
+        android:id="@+id/package_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
+        android:maxLines="2"
         settings:layout_constraintStart_toStartOf="@id/label"
         settings:layout_constraintEnd_toEndOf="@id/label"
         settings:layout_constraintTop_toBottomOf="@id/label"
         settings:layout_constraintBottom_toBottomOf="@id/icon" />
 
     <CheckBox
-        android:id="@+id/checkBox"
+        android:id="@+id/check_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="false"

res/layout/headsup_preference_applist.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 The Android Open Source 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="@dimen/switchbar_subsettings_margin_start"
-        android:paddingEnd="@dimen/switchbar_subsettings_margin_end"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:dividerHeight="0dp"
-        android:clipToPadding="false">
-
-        <!-- Icon view for Heads-up BlackListing/StopListing app lists -->
-        <LinearLayout
-            android:id="@+id/icon_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:dividerHeight="0dp"
-            android:orientation="horizontal">
-
-            <com.android.internal.widget.PreferenceImageView
-                android:id="@android:id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scaleType="centerInside"
-                android:maxWidth="26dp"
-                android:maxHeight="26dp"/>
-
-        </LinearLayout>
-
-        <!-- Text view for Heads-up BlackListing/StopListing app lists -->
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:dividerHeight="0dp">
-
-            <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingStart="14dp"
-                android:gravity="center_vertical"
-                android:textAppearance="?android:attr/textAppearanceListItem"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                android:layout_marginBottom="8dip" />
-
-        </RelativeLayout>
-
-</LinearLayout>

res/values-sk-rSK/cherish_strings.xml

@@ -0,0 +1,788 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 CherishOS
+     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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- App Title -->
+    <string name="cherish_settings_title">Cherish Settings</string>
+    <!-- Categories -->
+    <string name="button_title">Buttons</string>
+    <string name="button_summary">Hardware keys, Navigation bar</string>
+    <string name="gestures_title">Gestures</string>
+    <string name="gestures_summary">Jump to camera, swipe to screenshot</string>
+    <string name="lockscreen_title">Lock screen</string>
+    <string name="lockscreen_summary">Music visualizer, charging animation, clock style</string>
+    <string name="misc_title">Miscellaneous</string>
+    <string name="misc_summary">Gaming mode, volume controls</string>
+    <string name="animations_title">Animations</string>
+    <string name="animations_summary">System animations</string>
+    <string name="powermenu_title">Power menu</string>
+    <string name="powermenu_summary">Advanced restart, power menu opacity</string>
+    <string name="theme_title">Themes</string>
+    <string name="theme_summary">System theme, rounded, switch theme</string>
+    <string name="quicksettings_title">Quick Settings</string>
+    <string name="quicksettings_summary">Tile layout, blur</string>
+    <string name="recents_title">Recents apps</string>
+    <string name="recents_summary">Slim recents</string>
+    <string name="statusbar_title">Status bar</string>
+    <string name="statusbar_summary">Clock, carrier, status icons</string>
+    <string name="volume_title">Volume rockers</string>
+    <string name="volume_summary">Volume rockers</string>
+    <string name="notifications_title">Notifications</string>
+    <string name="notifications_summary">Battery light, notifications header</string>
+    <string name="about_summary">Learn more about CherishOS</string>
+    <string name="device_part_title">Device features</string>
+    <string name="qs_category">QS category</string>
+    <string name="navbar_title">Navigation bar</string>
+    <string name="volume_keys_title">Volume keys</string>
+    <string name="udfps_category">UDFPS</string>
+    <!-- General strings -->
+    <string name="ok">OK</string>
+    <string name="reset">Reset</string>
+    <string name="cancel">Cancel</string>
+    <string name="save">Save</string>
+    <string name="none_string">None</string>
+    <string name="default_string">Default</string>
+    <string name="disabled">Disabled</string>
+    <!-- Color Picker -->
+    <string name="dialog_color_picker">Color Picker</string>
+    <string name="press_color_to_apply">Press on color below to apply</string>
+    <string name="arrow_right">→</string>
+    <string name="arrow_down">↓</string>
+    <string name="hex">Hex:</string>
+    <string name="hex_hint">#ff000000</string>
+    <string name="set">Set</string>
+    <string name="color_default">Default</string>
+    <string name="led_color_green">Green</string>
+    <string name="led_color_red">Red</string>
+    <!-- Custom seekbar -->
+    <string name="custom_seekbar_value">Value: <xliff:g id="v">%s</xliff:g></string>
+    <string name="custom_seekbar_default_value">Default</string>
+    <string name="custom_seekbar_default_value_to_set">Default value: <xliff:g id="v">%s</xliff:g>\nLong press to set</string>
+    <string name="custom_seekbar_default_value_is_set">Default value is set</string>
+    <string name="add_package_to_title">Add application</string>
+    <string name="profile_choose_app">Choose app</string>
+    <string name="dialog_delete_title">Delete</string>
+    <string name="dialog_delete_message">Remove selected item?</string>
+    <!-- Units -->
+    <string name="unit_milliseconds">milliseconds</string>
+    <string name="unit_seconds">seconds</string>
+    <!-- QS settings -->
+    <string name="qs_title">Quick settings</string>
+    <!-- Lock screen visualizer -->
+    <string name="visualizer_title">Display music visualizer</string>
+    <!-- Power menu and dialogs opacity -->
+    <!-- AOKP custom system animations -->
+    <!-- Power menu Animations  -->
+    <string name="power_menu_animation">Power menu</string>
+    <!-- QS header image -->
+    <!-- Lockscreen -->
+    <string name="lockscreen_category">Lockscreen</string>
+    <!-- Themes -->
+    <string name="theme_type_title">System theme</string>
+    <string name="theme_type_summary">Select theme</string>
+    <!--Accenter -->
+    <string name="themes_hub_title">Themes</string>
+    <string name="themes_hub_summary">Accents-Gradients-Themes</string>
+    <string name="rgb_accent_picker_title_dark">Accent Picker</string>
+    <string name="rgb_accent_picker_summary">Choose the accent color yourself</string>
+    <string name="theme_option_reset_title">Reset Theme Options</string>
+    <string name="theme_option_reset_message">Are you sure you want to reset themes-accent to default?</string>
+    <!--ThemePicker-->
+    <string name="theme_select_title">Styles and Wallpapers</string>
+    <string name="theme_select_summary">Browse and select installed themes</string>
+    <string name="notification_light_settings">Notifications light</string>
+    <string name="search">Search</string>
+    <string name="search_apps">Search apps</string>
+    <!-- Themeing -->
+    <string name="dark_ui_mode_summary">Browse the dark theme options</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the settings category for theme overlays. -->
+    <string name="theme_customization_category">Theming</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the adaptive icon shape (e.g. launcher and quick settings icons). -->
+    <string name="theme_customization_icon_shape_title">Icon shape</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize accent color. -->
+    <string name="theme_customization_icon_shape_summary">Set system icon shape style</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize headline and body fonts. -->
+    <string name="theme_customization_font_title">Headline / Body font</string>
+    <string name="theme_customization_font_summary">Set system font style</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the system wide icon pack. -->
+    <string name="theme_customization_icon_pack_title">Icon pack</string>
+    <string name="theme_customization_icon_pack_summary">Set custom icon pack style</string>
+    <string name="theme_customization_signal_icon_title">Signal icon style</string>
+    <string name="theme_customization_signal_icon_summary">Set custom signal icon style</string>
+    <string name="theme_customization_wifi_icon_title">WiFi icon style</string>
+    <string name="theme_customization_wifi_icon_summary">Set custom wifi icon style</string>
+    <!-- Custom Signal bar icons -->
+    <string name="custom_signal_bar_title">Signal</string>
+    <!-- Custom Wi-Fi bar icons -->
+    <string name="custom_wifi_bar_title">Wi-Fi</string>
+    <!-- Battery light -->
+    <string name="battery_light_settings">Battery charging light</string>
+    <string name="battery_light_enable">Enable</string>
+    <string name="battery_full_light_enabled">Battery light when full charged</string>
+    <string name="battery_light_allow_on_dnd_title">Battery light in Do Not Disturb mode</string>
+    <string name="battery_light_low_blinking_title">Blinking light on low battery</string>
+    <string name="battery_light_cat">Battery light color when charging</string>
+    <string name="battery_light_low_color">Low battery</string>
+    <string name="battery_light_medium_color">Medium battery</string>
+    <string name="battery_light_full_color">Almost full battery</string>
+    <string name="battery_light_reallyfull_color">Full (100) battery</string>
+    <string name="status_bar_quick_qs_pulldown">Quick QS pulldown</string>
+    <string name="quick_pulldown_none">Disabled</string>
+    <string name="quick_pulldown_right">Pulldown status bar from right side</string>
+    <string name="quick_pulldown_left">Pulldown status bar from left side</string>
+    <string name="quick_pulldown_always">Always show quick settings on status bar pull down</string>
+    <!-- Statusbar double tap to sleep -->
+    <string name="double_tap_to_sleep_title">Status bar double tap to sleep</string>
+    <string name="double_tap_to_sleep_summary">Double tap on the status bar to put the device to sleep</string>
+    <!-- Lockscreen double tap to sleep -->
+    <string name="lockscreen_gesture_title">Gestures</string>
+    <string name="double_tap_sleep_lockscreen_title">Lockscreen double tap to sleep</string>
+    <string name="double_tap_sleep_lockscreen_summary">Double tap anywhere on the lockscreen to put the device to sleep</string>
+    <string name="notification_sound_vib_screen_on_title">Noisy notifications if screen on</string>
+    <string name="notification_sound_vib_screen_on_summary">Disable to block notifications sound and vibration when the screen is awake</string>
+    <!-- Heads up options -->
+    <string name="notifications_category_title">Annoying notifications protection</string>
+    <string name="less_boring_heads_up_title">Make heads up less annoying</string>
+    <string name="less_boring_heads_up_summary">Show heads up only for dialer or messaging app if they are not in foreground</string>
+    <!-- Incall vibrate options -->
+    <string name="incall_vibration_category">In-call vibration options</string>
+    <string name="incall_vibrate_connect_title">Vibrate on connect</string>
+    <string name="incall_vibrate_call_wait_title">Vibrate on call waiting</string>
+    <string name="incall_vibrate_disconnect_title">Vibrate on disconnect</string>
+    <!-- Launch music player when headset is connected -->
+    <string name="headset_connect_player_title">Launch music app on headset connection</string>
+    <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string>
+    <!-- Network traffic -->
+    <string name="network_traffic_title">Network traffic indicator</string>
+    <string name="network_traffic_summary">Enable or disable network speed indicator in status bar</string>
+    <string name="network_traffic_master_switch_title">Use Network Traffic Indicator</string>
+    <string name="network_options_title">Options</string>
+    <string name="network_traffic_autohide_title">Hide network traffic indicator if inactive</string>
+    <string name="network_traffic_autohide_summary">Hide when network traffic indicator is below 1 KB/s</string>
+    <!-- NavBar Inverse -->
+    <string name="navigation_bar_inverse_title">Invert 3 button navigation bar</string>
+    <string name="status_bar_icons_category_title">Icons</string>
+    <!-- Status bar - icon blocklist -->
+    <string name="status_bar_icons_title">Status bar icons</string>
+    <string name="status_bar_icons_summary">Choose which status bar icons can be shown</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Show data disabled icon</string>
+    <string name="data_disabled_icon_summary">Display the cross sign next to signal bar when data is disabled</string>
+    <!-- Show old style mobile data icon -->
+    <string name="use_old_mobiletype_title">Use old style mobile data icons</string>
+    <string name="use_old_mobiletype_summary">Show mobile type icon on top of the signal indicator</string>
+    <!-- Show LTE/4G switch -->
+    <string name="show_fourg_icon_title">Show 4G instead of LTE</string>
+    <string name="show_fourg_icon_summary">Replace LTE indicator with 4G</string>
+    <!-- Roaming indicator icon -->
+    <string name="roaming_indicator_icon_title">Roaming indicator</string>
+    <string name="roaming_indicator_icon_summary">Display roaming indicator when in roaming mode</string>
+    <!-- Lock screen media artwork -->
+    <string name="lockscreen_media_art_options_title">Lock screen media art</string>
+    <!-- Media art -->
+    <string name="media_art_title">Media cover art</string>
+    <string name="media_art_summary">Display media cover art when available</string>
+    <!-- Lock screen album art filter -->
+    <string name="lockscreen_albumart_filter_title">Media cover art filter</string>
+    <string name="lockscreen_albumart_filter_grayscale">Grayscale</string>
+    <string name="lockscreen_albumart_filter_tint">Accent tinted</string>
+    <string name="lockscreen_albumart_filter_blur">Blur</string>
+    <string name="lockscreen_albumart_filter_grayblur">Grayscale and blurred</string>
+    <string name="lockscreen_albumart_filter_blur_radius_title">Blur amount for lockscreen media artwork</string>
+    <!-- Show VoLTE icon on statusbar -->
+    <string name="volte_switch_title">VoLTE icon</string>
+    <string name="volte_switch_summary">Display VoLTE icon</string>
+    <string name="volte_icon_title">VoLTE icon</string>
+    <string name="volte_icon_summary">Display VoLTE icon</string>
+    <string name="volte_icon_style_title">Select VoLTE Icon</string>
+    <string name="volte_icon_asus">VoLTE Asus Icon</string>
+    <string name="volte_icon_vo">Vo Only Icon</string>
+    <string name="volte_icon_volte">VoLTE Icon</string>
+    <string name="volte_icon_oos">VoLTE OOS Icon</string>
+    <string name="volte_icon_hd">HD Icon</string>
+    <string name="volte_icon_hd2">HD CAF Icon</string>
+    <string name="volte_icon_miui">MIUI 11 Icon</string>
+    <string name="volte_icon_emui">EMUI Icon</string>
+    <string name="volte_icon_margaritov">HD Filled Icon</string>
+    <string name="volte_icon_margaritov2">Margaritov VoLTE Icon</string>
+    <string name="volte_icon_vivo">Vivo Icon</string>
+    <string name="volte_icon_aris">Aris Icon</string>
+    <string name="volte_icon_beast">Aww Icon</string>
+    <string name="volte_icon_ios">Ios Icon</string>
+    <string name="volte_icon_lr">Livenge Icon</string>
+    <string name="volte_icon_realme">Realme Icon</string>
+    <string name="volte_icon_typeA">Mild Icon</string>
+    <string name="volte_icon_typeB">Filth Icon</string>
+    <string name="volte_icon_typeC">Mue Icon</string>
+    <string name="volte_icon_typeD">Sus Icon</string>
+    <string name="volte_icon_typeE">Acherus Icon</string>
+    <string name="volte_icon_vcircle">Circle Icon</string>
+    <string name="volte_icon_vimeo">Vimeo Icon</string>
+    <string name="volte_icon_volit">Volit Icon</string>
+    <string name="volte_icon_zirco">Ziroc Icon</string>
+    <!-- Statusbar Battery -->
+    <string name="battery_style_title">Battery icon style</string>
+    <string name="battery_style_summary">Customize battery icons, hide or show percentage</string>
+    <string name="battery_style_category_title">Battery icon</string>
+    <string name="status_bar_battery_category_title">In Status Bar</string>
+    <string name="status_bar_battery_percent_title">Battery percentage</string>
+    <string name="status_bar_battery_style_title">Battery style</string>
+    <string name="status_bar_battery_style_icon_portrait">Icon portrait (default)</string>
+    <string name="status_bar_battery_style_icon_rlandscape">Icon landscape (Right)</string>
+    <string name="status_bar_battery_style_icon_landscape">Icon landscape (Left)</string>
+    <string name="status_bar_battery_style_icon_rlandscape_style_a">Landscape R Style A</string>
+    <string name="status_bar_battery_style_icon_landscape_style_a">Landscape L Style A</string>
+    <string name="status_bar_battery_style_icon_rlandscape_style_b">Landscape R Style B</string>
+    <string name="status_bar_battery_style_icon_landscape_style_b">Landscape L Style B</string>
+    <string name="status_bar_battery_style_icon_landscape_pill">Portrait Mx</string>
+    <string name="status_bar_battery_style_icon_landscape_line">Landscape Lorn</string>
+    <string name="status_bar_battery_style_icon_landscape_musku">Portrait IOS</string>
+    <string name="status_bar_battery_style_icon_landscape_signal">Landscape Airoo</string>
+    <string name="status_bar_battery_style_icon_landscape_buddy">Landscape Capsule</string>
+    <string name="status_bar_battery_style_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Circle (Dotted)</string>
+    <string name="status_bar_battery_style_filled_circle">Circle (Filled)</string>
+    <string name="status_bar_battery_style_big_circle">Big circle</string>
+    <string name="status_bar_battery_style_big_dotted_circle">Big dotted circle</string>
+    <string name="status_bar_battery_style_text">Text</string>
+    <string name="status_bar_battery_style_hidden">Hidden</string>
+    <string name="status_bar_battery_percentage_default">Hidden (default)</string>
+    <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
+    <string name="status_bar_battery_percent_text_next_right">Next to the icon (right)</string>
+    <string name="status_bar_battery_percent_text_next_left">Next to the icon (left)</string>
+    <string name="status_bar_battery_text_charging_title">Battery percentage when charging</string>
+    <string name="status_bar_battery_text_charging_summary">Always display battery percentage when charging</string>
+    <!-- QS battery -->
+    <string name="qs_battery_category_title">In QS Panel</string>
+    <string name="qs_use_status_bar_battery_style">Follow status bar style</string>
+    <!-- Statusbar Clock background chip -->
+    <string name="statusbar_clock_chip_title">Background chip</string>
+    <string name="statusbar_clock_chip_summary">Display accented chip behind clock</string>
+    <!-- Quick Settings brightness slider -->
+    <string name="qs_show_brightness_slider_title">Brightness slider</string>
+    <string name="qs_show_brightness_slider_never">Never show</string>
+    <string name="qs_show_brightness_slider_expanded">Show when expanded</string>
+    <string name="qs_show_brightness_slider_always">Show always</string>
+    <string name="qs_show_brightness_slider_not_expanded">Show when not expanded</string>
+    <string name="qs_brightness_slider_position_title">Position</string>
+    <string name="qs_brightness_slider_position_top">Top</string>
+    <string name="qs_brightness_slider_position_bottom">Bottom</string>
+    <!-- Quick Settings brightness icon -->
+    <string name="qs_show_auto_brightness_title">Auto brightness icon</string>
+    <string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
+    <!-- Laboratory - Ignore window secure -->
+    <string name="laboratory_ignore_window_secure_title">Ignore window secure flags</string>
+    <string name="laboratory_ignore_window_secure_summary">This removes the screenshots and screenrecords limits for all applications. Normally, special applications are replaced with black areas in records. This can be convenient in some cases but may lead to privacy leaks. After changing this toggle, you may need to restart applications for the change to take effect.</string>
+    <!-- Lockscreen battery info -->
+    <string name="lockscreen_charging_info_title">Show charging info in lockscreen</string>
+    <string name="lockscreen_charging_info_summary">Shows temperature, charging current and more while plugged in</string>
+    <!-- QS Transparency -->
+    <string name="qs_transparency_title">Background transparency</string>
+    <string name="qs_transparency_summary">Set transparency level for QS background</string>
+    <string name="click_partial_screenshot_title">Click to partial screenshot</string>
+    <string name="click_partial_screenshot_summary">Short click Volume Down and Power to take partial screenshot</string>
+    <!-- Brightness control -->
+    <string name="status_bar_brightness_control_title">Brightness control</string>
+    <string name="status_bar_brightness_control_summary">Adjust brightness by sliding across the status bar</string>
+    <!-- Power menu on lockscreen -->
+    <string name="power_menu_hide_on_secure_title">Hide power menu on lock screen</string>
+    <string name="power_menu_hide_on_secure_summary">This will hide the power menu only on a secure lock screen</string>
+    <!-- Hide Status bar on lock screen -->
+    <string name="hide_lockscreen_status_bar_title">Hide status bar</string>
+    <string name="hide_lockscreen_status_bar_summary">Touch status bar to toggle visibility</string>
+    <!-- Navigation bar -->
+    <string name="navigation_bar_category">Navigation bar</string>
+    <string name="navigation_bar_title">On-screen navigation bar</string>
+    <string name="navigation_bar_summary">Enable on-screen navigation keys</string>
+    <string name="navigation_bar_arrow_keys_title">Show arrow keys while typing</string>
+    <string name="navigation_bar_arrow_keys_summary">Display left and right cursor buttons in navigation bar while typing</string>
+    <string name="navigation_bar_compact_layout_title">Compact layout</string>
+    <string name="navigation_bar_compact_layout_summary">Use a compact layout in the navigation bar</string>
+    <string name="system_navigation_summary">Choose which system navigation style to use</string>
+    <string name="navbar_layout_category_title">Layout</string>
+    <!-- Volume rocker wake -->
+    <string name="volume_rocker_wake_title">Volume rocker wake</string>
+    <string name="volume_rocker_wake_summary">Pressing the volume keys will wake your device</string>
+    <string name="volume_category">Volume rocker</string>
+    <!-- Volume Steps Fragment -->
+    <string name="volume_steps_fragment_title">Volume steps</string>
+    <string name="volume_steps_summary">Customize volume steps</string>
+    <string name="volume_steps_alarm_title">Volume steps: Alarm</string>
+    <string name="volume_steps_dtmf_title">Volume steps: DTMF</string>
+    <string name="volume_steps_music_title">Volume steps: Media</string>
+    <string name="volume_steps_notification_title">Volume steps: Notification</string>
+    <string name="volume_steps_ring_title">Volume steps: Ringer</string>
+    <string name="volume_steps_system_title">Volume steps: System</string>
+    <string name="volume_steps_voice_call_title">Volume steps: Voice Call</string>
+    <string name="volume_steps_reset">Reset</string>
+    <!-- Buttons - Enable navbar -->
+    <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>
+    <!-- Buttons - Swap capacitive keys -->
+    <string name="swap_capacitive_keys_title">Swap capacitive buttons</string>
+    <string name="swap_capacitive_keys_summary">Swap the order of recents and back buttons</string>
+    <!-- HW keys -->
+    <string name="hardware_keys_title">Buttons</string>
+    <string name="hardware_keys_category">Hardware navigation buttons</string>
+    <string name="hardware_keys_disable_title">Disable hardware buttons</string>
+    <string name="hardware_keys_disable_summary">Use the device hardware keys for navigation</string>
+    <string name="hardware_keys_volume_keys_title">Volume rocker</string>
+    <!-- Hardware button navigation -->
+    <string name="picker_activities">Activities</string>
+    <string name="select_custom_app_title">Select custom app</string>
+    <string name="select_custom_activity_title">Select custom activity</string>
+    <string name="profile_applist_title">Applications</string>
+    <string name="choose_action_title">Choose action</string>
+    <string name="action_entry_default_action">Default settings</string>
+    <string name="action_entry_select_app">Select application</string>
+    <string name="action_entry_custom_action">Select custom action</string>
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_back_key_title">Back button</string>
+    <string name="hardware_keys_menu_key_title">Menu button</string>
+    <string name="hardware_keys_assist_key_title">Search button</string>
+    <string name="hardware_keys_appswitch_key_title">Recents button</string>
+    <string name="hardware_keys_camera_key_title">Camera button</string>
+    <string name="hardware_keys_short_press_title">Short press action</string>
+    <string name="hardware_keys_double_tap_summary">Set double tap action</string>
+    <string name="hardware_keys_single_tap_summary">Set single tap action</string>
+    <string name="hardware_keys_long_press_summary">Set long press action</string>
+    <string name="hardware_keys_single_tap_title">Single tap action</string>
+    <string name="hardware_keys_long_press_title">Long press action</string>
+    <string name="hardware_keys_double_tap_title">Double tap action</string>
+    <string name="hardware_keys_action_nothing">No action</string>
+    <string name="hardware_keys_action_menu">Open/close menu</string>
+    <string name="hardware_keys_action_app_switch">Recent apps switcher</string>
+    <string name="hardware_keys_action_search">Search assistant</string>
+    <string name="hardware_keys_action_voice_search">Voice search</string>
+    <string name="hardware_keys_action_in_app_search">In-app search</string>
+    <string name="hardware_keys_action_launch_camera">Launch camera</string>
+    <string name="hardware_keys_action_sleep">Turn screen off</string>
+    <string name="hardware_keys_action_split_screen">Split screen</string>
+    <string name="hardware_keys_action_close_app">Kill app</string>
+    <string name="hardware_keys_action_torch">Flashlight</string>
+    <string name="hardware_keys_action_screenshot">Screenshot</string>
+    <string name="hardware_keys_action_volume_panel">Toggle volume panel</string>
+    <string name="hardware_keys_action_clear_all_notifications">Clear all notifications</string>
+    <string name="hardware_keys_action_notifications_panel">Toggle notifications panel</string>
+    <string name="hardware_keys_action_toggle_qs_panel">Toggle QS panel</string>
+    <string name="hardware_keys_action_ringer_modes">Ringer modes</string>
+    <string name="hardware_keys_swipe_right_key_title">Swipe right</string>
+    <string name="hardware_keys_swipe_left_key_title">Swipe left</string>
+    <string name="hardware_keys_long_tap_key_title">Long tap</string>
+    <string name="hardware_keys_swipe_tap_title">Swipe action</string>
+    <string name="hardware_keys_long_tap_title">Long tap action</string>
+    <string name="button_wake_title">Wake device</string>
+    <string name="button_wake_summary">Wake device by pressing the button</string>
+    <string name="camera_sleep_on_release_title">Screen peek</string>
+    <string name="camera_sleep_on_release_summary">A half press will keep the screen on only while the button is held down</string>
+    <string name="camera_launch_title">Launch camera</string>
+    <string name="camera_launch_summary">A longpress and release will launch camera</string>
+    <string name="cursor_section_header">Cursor</string>
+    <string name="volume_key_cursor_control_title">Keyboard cursor control</string>
+    <string name="volume_key_cursor_control_off">Disabled</string>
+    <string name="volume_key_cursor_control_on">Volume Up/Down - Cursor Left/Right</string>
+    <string name="volume_key_cursor_control_on_reverse">Volume Up/Down - Cursor Right/Left</string>
+    <string name="swap_volume_buttons_title">Reorient</string>
+    <string name="swap_volume_buttons_summary">Swap volume buttons when the screen is rotated</string>
+    <string name="volume_panel_on_left_title">Show volume panel on left</string>
+    <string name="volume_panel_on_left_summary">Display volume panel on the left side of the screen</string>
+    <!-- Alert Slider Notifications (OnePlus devices) -->
+    <string name="alert_slider_notifications_title">Alert slider notifications</string>
+    <string name="alert_slider_notifications_summary">Display notification when changing alert slider position</string>
+    <!-- Power Menu -->
+    <string name="power_menu_title">Power menu</string>
+    <string name="power_menu_title_summary">View or change power menu entries</string>
+    <string name="powermenu_screenshot">Screenshot</string>
+    <string name="powermenu_power">Power</string>
+    <string name="powermenu_advanced">Advanced reboot options</string>
+    <string name="powermenu_restart">Restart</string>
+    <string name="powermenu_airplane">Airplane</string>
+    <string name="powermenu_settings">Settings</string>
+    <string name="powermenu_lockdown">Lock Down</string>
+    <string name="powermenu_soundpanel">Sound Panel</string>
+    <string name="powermenu_users">Users</string>
+    <string name="powermenu_logout">Logout</string>
+    <string name="powermenu_emergency">Emergency</string>
+    <!-- Unlock FPS for specific games -->
+    <string name="use_games_spoof_title">Unlock higher FPS in games</string>
+    <string name="use_games_spoof_summary">Spoof your device as a different model for specific games to unlock higher FPS</string>
+    <!-- Netflix Spooft -->
+    <string name="netflix_spoof_title">Netflix spoof</string>
+    <string name="netflix_spoof_summary">Spoof your device as different model for Netflix</string>
+    <!-- Unlimited google photos storage -->
+    <string name="use_photos_spoof_title">Unlimited Photos storage</string>
+    <string name="use_photos_spoof_summary">Spoof your device as Pixel XL for Google Photos app only to provide unlimited storage for backup</string>
+    <!-- Notification guts kill app button -->
+    <string name="notification_guts_kill_app_button_title">Force stop button</string>
+    <string name="notification_guts_kill_app_button_summary">Show force stop button in the notification\'s longpress menu</string>
+    <!-- Toast app icon -->
+    <string name="toast_icon_title">Toast app icon</string>
+    <string name="toast_icon_summary">Display the app\'s icon corresponding with the toast</string>
+    <!-- AOD Schedule -->
+    <string name="always_on_display_schedule_title">Always on display schedule</string>
+    <string name="always_on_display_schedule_sunset">Sunset</string>
+    <string name="always_on_display_schedule_sunrise">Sunrise</string>
+    <string name="always_on_display_schedule_mixed_sunset">Turns on from sunset till a time</string>
+    <string name="always_on_display_schedule_mixed_sunrise">Turns on from a time till sunrise</string>
+    <!-- Status bar - Clock -->
+    <string name="status_bar_clock_title">Clock &amp; date</string>
+    <string name="status_bar_clock_summary">Customize clock &amp; date</string>
+    <string name="status_bar_clock_seconds_title">Clock seconds</string>
+    <string name="status_bar_clock_seconds_summary">Display seconds next to clock in status bar</string>
+    <string name="status_bar_clock_position_title">Clock style</string>
+    <string name="status_bar_clock_position_right">Right</string>
+    <string name="status_bar_clock_position_left">Left</string>
+    <string name="status_bar_clock_position_center">Center</string>
+    <string name="status_bar_clock_position_hidden">Hidden</string>
+    <string name="status_bar_clock_auto_hide_title">Auto hide</string>
+    <string name="status_bar_clock_auto_hide_launcher_summary">Hide clock if launcher is visible</string>
+    <string name="status_bar_clock_auto_hide_summary">Hide clock at regular interval</string>
+    <string name="status_bar_clock_auto_hide_hdur_title">Hide duration</string>
+    <string name="status_bar_clock_auto_hide_hdur_summary">Number of seconds to hide clock</string>
+    <string name="status_bar_clock_auto_hide_sdur_title">Show duration</string>
+    <string name="status_bar_clock_auto_hide_sdur_summary">Number of seconds to wait before hiding clock</string>
+    <string name="status_bar_am_pm_title">AM/PM style</string>
+    <string name="status_bar_am_pm_info">24-hour clock is enabled</string>
+    <string name="status_bar_am_pm_normal">Normal</string>
+    <string name="status_bar_am_pm_small">Small</string>
+    <string name="status_bar_am_pm_hidden">Hidden</string>
+    <string name="status_bar_date_title">Date</string>
+    <string name="status_bar_date_none">Hidden</string>
+    <string name="status_bar_date_small">Small</string>
+    <string name="status_bar_date_normal">Normal</string>
+    <string name="status_bar_date_format_title">Date format</string>
+    <string name="status_bar_date_style">Date style</string>
+    <string name="status_bar_date_style_normal">Normal</string>
+    <string name="status_bar_date_style_lowercase">Lowercase</string>
+    <string name="status_bar_date_style_uppercase">Uppercase</string>
+    <string name="status_bar_date_format_custom">Custom java format</string>
+    <string name="status_bar_date_string_edittext_title">Must be in DateFormat eg. MM/dd/yy</string>
+    <string name="status_bar_date_string_edittext_summary">Enter string</string>
+    <string name="clock_date_position">Date position</string>
+    <string name="clock_date_right">Right of time</string>
+    <string name="clock_date_left">Left of time</string>
+    <string name="clock_font_size_title">Clock font size</string>
+    <!-- QS clock -->
+    <string name="qs_clock_title">Clock</string>
+    <string name="qs_clock_summary">Display clock in quick status bar header</string>
+    <!-- QS date -->
+    <string name="qs_date_title">Date</string>
+    <string name="qs_date_summary">Display date in quick status bar header</string>
+    <!-- Footer -->
+    <string name="qs_footer_category">QS Footer</string>
+    <string name="qs_footer_datausage_title">Data usage</string>
+    <string name="qs_footer_datausage_summary">Display data usage summary in quick settings footer</string>
+    <!-- Edge light -->
+    <string name="edge_light_title">Edge light</string>
+    <string name="enable_edge_light">Enable Edge Light</string>
+    <string name="edge_light_intro_text">Display an animation along the edges of the screen when pulsing</string>
+    <string name="edge_light_always_trigger_on_pulse_title">Always trigger on pulse</string>
+    <string name="edge_light_always_trigger_on_pulse_summary">Whether to show edge light whenever ambient display is shown and not just for notifications</string>
+    <string name="edge_light_repeat_animation_title">Repeat animation</string>
+    <string name="edge_light_repeat_animation_summary_on">Repeat until timeout</string>
+    <string name="edge_light_repeat_animation_summary_off">Show only once</string>
+    <string name="edge_light_color_mode_title">Edge light color mode</string>
+    <string name="accent_color">Accent color (Default)</string>
+    <string name="notification_color">Notification color</string>
+    <string name="wallpaper_color">Wallpaper color</string>
+    <string name="custom_color">Custom color</string>
+    <string name="edge_light_custom_color_title">Custom color</string>
+    <!-- Custom settings dashboard style -->
+    <string name="settings_dashboard_style_title">Settings layout</string>
+    <string name="settings_dashboard_style_aosp">Aosp</string>
+    <string name="settings_dashboard_style_oos11">OxygenOS 11</string>
+    <string name="settings_dashboard_style_oos12">OxygenOS 12</string>
+    <string name="settings_dashboard_style_cherish">Cherish</string>
+    <string name="settings_dashboard_style_cherish_clean">Cherish Clean</string>
+    <string name="settings_layout_category_title">Settings UI interface</string>
+    <string name="settings_base_style_title">Settings Base layout</string>
+    <string name="settings_base_style_summary">Use an alternative layout for setting menus</string>
+    <string name="settings_home_style_title">Settings Home layout</string>
+    <string name="settings_home_style_summary">Use stock aosp layout for homepage</string>
+    <string name="disable_usercard_title">Settings UserCard</string>
+    <string name="disable_usercard_summary">Toggle in order not to show the usercard on main settings page</string>
+    <!-- Lockscreen Clocks -->
+    <string name="lock_screen_custom_clock_face_category">Lockscreen Clock</string>
+    <string name="lock_screen_custom_clock_face_title">Lockscreen clock style</string>
+    <string name="lock_screen_custom_clock_face_default">Default</string>
+    <string name="lock_screen_custom_clock_face_sfunny">Sfuny</string>
+    <string name="lock_screen_custom_clock_face_oos">OOS</string>
+    <string name="lock_screen_custom_clock_face_clockertino">Clockertino</string>
+    <string name="lock_screen_custom_clock_face_spark">Spark</string>
+    <string name="lock_screen_custom_clock_face_spark_circle">Spark Circle</string>
+    <!-- UDFPS Haptic Feedback -->
+    <string name="udfps_haptic_feedback_title">UDFPS haptic feedback</string>
+    <string name="udfps_haptic_feedback_summary">Vibrate when touching UDFPS icon</string>
+    <!-- Udfps authentication / error vibration -->
+    <string name="udfps_success_vib_title">Udfps authentication vibration</string>
+    <string name="udfps_success_vib_summary">Vibrate on successful fingerprint authentication</string>
+    <string name="udfps_error_vib_title">Udfps error vibration</string>
+    <string name="udfps_error_vib_summary">Vibrate on unsuccessful fingerprint authentication</string>
+    <!-- UDFPS Recog Animation -->
+    <string name="udfps_customization">UDFPS customization</string>
+    <string name="udfps_recog_animation">UDFPS animation</string>
+    <string name="udfps_recog_animation_summary">Shows an animation while reading your finger</string>
+    <string name="udfps_recog_animation_effect_title">UDFPS custom animation</string>
+    <string name="udfps_recog_animation_effect_summary">Choose animation effect</string>
+    <string name="udfps_settings_title">UDFPS settings</string>
+    <string name="udfps_settings_summary">Settings for customizing the UDFPS</string>
+    <!-- UDFPS icon picker -->
+    <string name="udfps_icon_picker_title">UDFPS icon picker</string>
+    <string name="udfps_icon_picker_summary">Choose your favorite fingerprint icon</string>
+    <!-- Custom FOD Icon -->
+    <string name="custom_fp_icon_title">Custom UDFPS Icon</string>
+    <string name="custom_fp_icon_summary">Enable custom UDFPS Icon from files</string>
+    <string name="custom_fp_select_title">Select Custom UDFPS Icon</string>
+    <string name="custom_fp_select_summary">Select custom image from your saved files or gallery</string>
+    <!-- UDFPS pressed color -->
+    <string name="udfps_pressed_color_title">Udfps pressed color</string>
+    <string name="udfps_pressed_color_summary">Choose your favorite udfps pressed color</string>
+    <!-- Fingerprint Ripple Effect -->
+    <string name="enable_fingerprint_ripple_effect_title">Ripple effect</string>
+    <string name="enable_fingerprint_ripple_effect_summary">Show ripple effect on unlock with fingerprint</string>
+    <!-- reTicker -->
+    <string name="reticker_title">reTicker</string>
+    <string name="reticker_summary">Replace heads-up notification with slim and less invasive version of redesigned ticker</string>
+    <string name="new_reticker_title">Alternative reTicker</string>
+    <string name="new_reticker_summary">Use an alternative layout for reticker that is inspired from ios</string>
+    <string name="new_reticker_animation_title">Alternative reTicker animation</string>
+    <string name="new_reticker_animation_summary">Use a different animation for reticker (enabled by default on alternative reTicker)</string>
+    <string name="reticker_colored_title">Use app colored background</string>
+    <string name="reticker_colored_summary">Replace reTicker background color using notification app main color</string>
+    <!-- VoWiFi icon -->
+    <string name="vowifi_icon_title">VoWiFi icon</string>
+    <string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
+    <string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
+    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi instead of VoLTE icon</string>
+    <string name="vowifi_icon_style_title">VoWiFi icon style</string>
+    <string name="vowifi_icon_default">Default Icon</string>
+    <string name="vowifi_icon_emui">EMUI Icon</string>
+    <string name="vowifi_icon_asus">Asus Icon</string>
+    <string name="vowifi_icon_oneplus">OOS Icon</string>
+    <string name="vowifi_icon_moto">Motorola Icon</string>
+    <string name="vowifi_icon_simple1">Simple1 Icon</string>
+    <string name="vowifi_icon_simple2">Simple2 Icon</string>
+    <string name="vowifi_icon_simple3">Simple3 Icon</string>
+    <string name="vowifi_icon_vivo">Vivo Icon</string>
+    <string name="vowifi_icon_margaritov">Margaritov Icon</string>
+    <!-- Privacy Indicator -->
+    <string name="mic_camera_privacy_indicator_title">Mic and camera privacy indicator</string>
+    <string name="mic_camera_privacy_indicator_summary">Show indicator when any app uses mic or camera</string>
+    <string name="location_privacy_indicator_title">Location privacy indicator</string>
+    <string name="location_privacy_indicator_summary">Show indicator when any app uses location</string>
+    <string name="projection_privacy_indicator_title">Media projection privacy indicator</string>
+    <string name="projection_privacy_indicator_summary">Show indicator when device screen is projected</string>
+    <!-- Notification count -->
+    <string name="statusbar_notif_count_title">Show notification count</string>
+    <string name="statusbar_notif_count_summary">Display the number of pending notifications</string>
+    <!-- Statusbar colored icons -->
+    <string name="statusbar_colored_icons_title">Colored icons</string>
+    <string name="statusbar_colored_icons_summary">Use proper app icons for notification icons in statusbar</string>
+    <!-- Bluetooth status -->
+    <string name="bluetooth_battery_title">Bluetooth battery status</string>
+    <string name="bluetooth_battery_summary">Display battery status for the connected bluetooth device, if available</string>
+    <!-- Torch Power button gestures -->
+    <string name="torch_power_button_gesture_title">Toggle torch when screen off</string>
+    <string name="torch_power_button_gesture_none">Disabled</string>
+    <string name="torch_power_button_gesture_dt">Double tap power button (slower single tap response), Disables double power tap for camera.</string>
+    <string name="torch_power_button_gesture_dt_toast">Jump to camera gesture is now disabled</string>
+    <string name="torch_power_button_gesture_lp">Long press power button</string>
+    <!-- App lock -->
+    <string name="app_lock_title">App lock</string>
+    <string name="app_lock_summary">Apps will require fingerprint authentication to launch</string>
+    <string name="app_lock_authentication_dialog_title">Unlock</string>
+    <string name="enable_debugging">Enable debugging</string>
+    <string name="disable_debugging">Disable debugging</string>
+    <string name="app_lock_packages_title">Protected apps</string>
+    <string name="app_lock_packages_summary">Select the apps to protect with biometrics or device credentials</string>
+    <string name="app_lock_timeout_title">Auto lock timeout</string>
+    <string name="app_lock_timeout_summary">Duration of time after which an unlocked app in background should be locked</string>
+    <string name="app_lock_notifications_title">Redact notifications</string>
+    <string name="app_lock_notifications_summary">          Notification content will be hidden and collapsed for selected apps when they are locked.
+          Heads up notifications will be automatically disabled.
+     </string>
+    <string name="app_lock_notifications_disabled_summary">Protect an application first</string>
+    <string name="app_lock_biometrics_allowed_title">Enable biometrics for unlocking</string>
+    <string name="app_lock_footer_text">Bubbles will be automatically dismissed after timeout</string>
+    <string name="enable_protection">Enable protection</string>
+    <!-- Power menu Animations  -->
+    <string name="power_menu_animation_title">Power menu animation</string>
+    <string name="power_menu_animation_dialog_title">Select power menu animation</string>
+    <string name="power_menu_animation_aosp">AOSP (default)</string>
+    <string name="power_menu_animation_bottom">Bottom</string>
+    <string name="power_menu_animation_top">Top</string>
+    <string name="power_menu_animation_xylon">Fly</string>
+    <string name="power_menu_animation_slide">Slide</string>
+    <string name="power_menu_animation_turn">Turn</string>
+    <string name="power_menu_animation_fly">Glow</string>
+    <string name="power_menu_animation_card">3D</string>
+    <string name="power_menu_animation_translucent_top">Translucent (top)</string>
+    <string name="power_menu_animation_translucent_bottom">Translucent (bottom)</string>
+    <string name="power_menu_animation_rotate">Rotate</string>
+    <!-- QS tiles animations category -->
+    <string name="qs_tile_animation_category_title">QS Tiles</string>
+    <!-- Tiles animation style -->
+    <string name="qs_tile_animation_style_title">Animation style</string>
+    <string name="qs_tile_animation_duration_title">Animation duration</string>
+    <string name="qs_tile_animation_interpolator_title">Tiles animation interpolator</string>
+    <string name="qs_tile_animation_style_off">No animation</string>
+    <string name="qs_tile_animation_style_flip">Flip</string>
+    <string name="qs_tile_animation_style_rotate">Rotate</string>
+    <string name="qs_tile_animation_duration_low">Low</string>
+    <string name="qs_tile_animation_duration_default">Default</string>
+    <string name="qs_tile_animation_duration_fast">Fast</string>
+    <string name="qs_tile_animation_duration_quite_fast">Quite fast</string>
+    <string name="qs_tile_animation_duration_super_fast">Super fast</string>
+    <string name="qs_tile_animation_interpolator_linearInterpolator">Linear</string>
+    <string name="qs_tile_animation_interpolator_accelerateInterpolator">Accelerate</string>
+    <string name="qs_tile_animation_interpolator_decelerateInterpolator">Decelerate</string>
+    <string name="qs_tile_animation_interpolator_accelerateDecelerateInterpolator">Accelerate decelerate</string>
+    <string name="qs_tile_animation_interpolator_bounceInterpolator">Bounce</string>
+    <string name="qs_tile_animation_interpolator_overshootInterpolator">Overshoot</string>
+    <string name="qs_tile_animation_interpolator_anticipateInterpolator">Anticipate</string>
+    <string name="qs_tile_animation_interpolator_anticipateOvershootInterpolator">Anticipate overshoot</string>
+    <string name="qs_set_animation_style">%1$s</string>
+    <string name="qs_set_animation_duration">%1$s</string>
+    <string name="qs_set_animation_interpolator">%1$s</string>
+    <!-- Power menu and dialogs opacity -->
+    <string name="power_menu_transparency">Power/reboot menu opacity</string>
+    <string name="power_menu_dialog_dim">Power/reboot dialog dim background amount</string>
+    <!-- Black theme -->
+    <string name="custom_theme_title">Use Custom theme</string>
+    <string name="custom_theme_summary">Force custom background colors</string>
+    <string name="custom_theme_default">Default</string>
+    <string name="custom_theme_black">Black</string>
+    <string name="custom_theme_clear">Clear</string>
+    <string name="custom_theme_vivid">Vivid(Monet)</string>
+    <!-- Pulse music visualizer -->
+    <string name="pulse_help_policy_notice_title">About Pulse</string>
+    <string name="pulse_help_policy_notice_summary">Pulse is a brilliant audio graphic equalizer when music plays on the device</string>
+    <string name="pulse_settings">Pulse</string>
+    <string name="pulse_settings_summary">Audio graphic equalizer for navigation bar and lockscreen</string>
+    <string name="show_navbar_pulse_title">Navbar Pulse</string>
+    <string name="show_navbar_pulse_summary">Audio graphic equalizer on the navigation bar</string>
+    <string name="show_lockscreen_pulse_title">Lockscreen Pulse</string>
+    <string name="show_lockscreen_pulse_summary">Audio graphic equalizer on the lockscreen</string>
+    <string name="show_ambient_pulse_title">Ambient Pulse</string>
+    <string name="show_ambient_pulse_summary">Audio graphic equalizer on the ambient screen</string>
+    <string name="pulse_render_mode_title">Render mode</string>
+    <string name="pulse_render_mode_fading_bars">Fading blocks</string>
+    <string name="pulse_render_mode_solid_lines">Solid lines</string>
+    <string name="pulse_legacy_mode_advanced_category">Fading blocks mode settings</string>
+    <string name="pulse_custom_fudge_factor">Sanity level</string>
+    <string name="pulse_lavalamp_speed_title">Lava lamp speed</string>
+    <string name="pulse_solid_units_count">Solid lines count</string>
+    <string name="pulse_solid_units_opacity">Solid lines opacity</string>
+    <string name="pulse_solid_units_rounded_title">Rounded corners</string>
+    <string name="pulse_solid_units_rounded_summary">Solid lines with rounded tip</string>
+    <string name="pulse_solid_dimen_category">Solid lines mode settings</string>
+    <string name="pulse_color_mode_title">Color</string>
+    <string name="pulse_color_accent">Accent</string>
+    <string name="pulse_color_custom">Custom</string>
+    <string name="pulse_color_lava_lamp">Lava lamp</string>
+    <string name="pulse_color_user_title">Choose color</string>
+    <string name="pulse_smoothing_enabled_title">Turn on smoothing</string>
+    <string name="pulse_smoothing_enabled_summary">Each bar is animated more smoothly</string>
+    <string name="pulse_custom_dimen">Bar width</string>
+    <string name="pulse_custom_div">Bar spacing</string>
+    <string name="pulse_filled_block_size">Block size</string>
+    <string name="pulse_empty_block_size">Block spacing</string>
+    <!-- Pulse Gravity n Mirror Options -->
+    <string name="pulse_custom_gravity_title">Gravity</string>
+    <string name="pulse_custom_gravity_bottom">Bottom</string>
+    <string name="pulse_custom_gravity_top">Top</string>
+    <string name="pulse_custom_gravity_center">Center</string>
+    <string name="visualizer_center_mirrored_title">Center mirrored</string>
+    <string name="visualizer_center_mirrored_summary">Set the visualizer in center mirrored mode</string>
+    <string name="pulse_vertical_mirror_title">Vertical Mirror</string>
+    <string name="pulse_vertical_mirror_summary">Create other pulse and flip vertically</string>
+    <!-- Smart charging -->
+    <string name="smart_charging_title">Smart Charging</string>
+    <string name="smart_charging_summary">Set maximum charging level</string>
+    <string name="smart_charging_switch_title">Enable Smart Charging</string>
+    <string name="smart_charging_level_title">Stop trigger level</string>
+    <string name="smart_charging_resume_level_title">Start trigger level</string>
+    <string name="smart_charging_reset_stats_title">Reset battery statistics</string>
+    <string name="smart_charging_reset_stats_summary">Reset battery statistics after reaching user defined charging level</string>
+    <string name="smart_charging_footer">Smart Charging allows you to set maximum charging level to extend the lifespan of your battery. When enabled, battery stops charging at Stop trigger level and resumes charging at Start trigger level. Stop trigger level should be always greater than Start trigger level.</string>
+    <!-- Quick settings styling -->
+    <string name="qs_styling">Quick Settings UI</string>
+    <string name="qs_styles_title">QS Panel Styles</string>
+    <string name="qs_outline">QS Outline Style</string>
+    <string name="qs_two_tone">QS Two-Tone Accent</string>
+    <string name="qs_color_pop">QS Color Pop</string>
+    <!-- QS tiles layout direction: vertical or horizontal -->
+    <string name="qs_tile_layout_category_title">Tile layout</string>
+    <string name="qs_tile_layout_title">Title Alignment</string>
+    <string name="qs_tile_layout_summary">Enable for centered layout.</string>
+    <!-- QS tiles title visibility -->
+    <string name="qs_tile_title_visibility_title">Hide tile titles</string>
+    <string name="qs_tile_title_visibility_summary">Toggle to hide tile titles</string>
+    <!-- QS tiles layout  -->
+    <string name="qs_layout_category_title">Tiles layout</string>
+    <string name="qs_tile_label_hide_title">Hide label</string>
+    <string name="qs_tile_label_hide_summary">Only show icon in tile</string>
+    <string name="qs_tile_label_size_title">Label text size</string>
+    <string name="qs_columns_portrait_title">Columns (portrait)</string>
+    <string name="qs_columns_landscape_title">Columns (landscape)</string>
+    <!-- Squiggle animation -->
+    <string name="show_squiggle_animation_title">Show squiggle animation</string>
+    <string name="show_squiggle_animation_summary">Show media panel squiggle animation, after change need to switch music, pause music or move the progress bar to apply</string>
+    <!-- Lockscreen interface -->
+    <string name="lockscreen_interface_title">Lockscreen User Interface</string>
+    <string name="lockscreen_clock_color_title">Custom lockscreen clock color</string>
+    <string name="lockscreen_clock_color_summary">Use custom color instead of wallpaper accent</string>
+    <string name="kg_custom_clock_color_title">Choose lockscreen clock color</string>
+    <string name="kg_custom_clock_font_title">Custom lockscreen clock font</string>
+    <string name="kg_custom_date_font_title">Custom lockscreen date font</string>
+    <string name="small_clock_doubleline_title">Double-line Lockscreen clock format</string>
+    <string name="small_clock_doubleline_summary">Use double-line clock instead of single line style for lockscreen clock</string>
+    <!-- QS Weather Options -->
+    <string name="qs_weather_title">QS System weather style</string>
+    <string name="qs_weather_summary">Configure system weather</string>
+    <string name="qsweather_dialog_title">QuickSettings weather location</string>
+    <string name="qs_weather_hidden">Hide weather</string>
+    <string name="qs_temperature_image_show_scale">Show temp with scale and image</string>
+    <string name="qs_temperature_image_hide_scale">Show temp with image without scale</string>
+    <string name="qs_temperature_show_scale_hide_image">Show temp with scale</string>
+    <string name="qs_temperature_hide_scale_hide_image">Show temp without scale</string>
+    <string name="qs_show_image">Show image</string>
+    <string name="weather_show_all_condition">Show temp with scale,image and weather condition</string>
+    <string name="qsweather_position_qqs">QuickSettings</string>
+    <string name="qsweather_position_qsb">QuickStatusbar</string>
+    <string name="qsweather_position_both">Both</string>
+    <!-- Launcher Weather Options -->
+    <string name="launcher_weather_title">Launcher System weather style</string>
+    <!-- Launcher Weather Options -->
+    <string name="kg_weather_title">Lockscreen System weather style</string>
+    <!-- Omni weather -->
+    <string name="qs_weather_settings_title">Weather Settings</string>
+    <string name="qs_weather_settings_summary">Setup icon pack and weather service</string>
+    <string name="weather_title">Weather Settings</string>
+    <string name="weather_config_title">Weather service</string>
+    <string name="weather_config_summary">System service settings</string>
+    <string name="weather_icon_pack_title">Condition icon pack</string>
+    <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Tips\u003a \n\n1. Users can install new icon packs from play store by searching for \"Chronus icons\".\n\n2. Condition icon pack is used for weather icons on quick settings and sushi launcher at a glance.\n\n3. Long press the QuickSettings weather view/logo/temperature to access weather settings with ease.</string>
+    <string name="qsweather_settings_title">QuickSettings Weather</string>
+    <string name="qsweather_settings_summary">Setup quicksettings weather views</string>
+    <!-- QS footer warnings -->
+    <string name="qs_footer_warnings_title">Footer alerts</string>
+    <string name="qs_footer_warnings_summary">Display an alert at bottom of QS panel when network is monitored by external apps or VPN</string>
+    <!-- QS footer icons -->
+    <string name="qs_footer_users_icon_title">User account icon</string>
+    <string name="qs_footer_users_icon_summary">Display multiuser accessibility icon when available</string>
+    <string name="qs_footer_edit_icon_title">Edit tiles icon</string>
+    <string name="qs_footer_show_power_menu_title">Power menu shortcut</string>
+    <string name="qs_footer_services_icon_title">Running services shortcut</string>
+    <string name="qs_footer_settings_icon_title">Settings shortcut</string>
+</resources>

res/values/cherish_maintainers.xml

@@ -69,9 +69,9 @@
    <string name="device_tissot">Xiaomi Mi A1</string>
    <string name="tissot_maintainer">Ajit</string>
    <string name="device_picasso">Xiaomi Redmi K30 5G</string>
-   <string name="picasso_maintainer">masarou</string>
+   <string name="picasso_maintainer">Dinh San</string>
    <string name="device_laurel_sprout">Xiaomi Mi A3</string>
-   <string name="laurel_sprout_maintainer">RAYAN(BASUBHAJANTRI)</string>
+   <string name="laurel_sprout_maintainer">AbStRaCt_IrIs</string>
    <string name="device_davinci">Xiaomi Mi 9T/K20</string>
    <string name="davinci_maintainer">Luis Gonzales</string>
    <string name="device_raphael">Xiaomi Mi 9T Pro/K20 Pro</string>
@@ -81,7 +81,7 @@
    <string name="device_surya">Xiaomi Poco X3</string>
    <string name="surya_maintainer">Pranjal Singh</string>
    <string name="device_beryllium">Xiaomi Poco F1</string>
-   <string name="beryllium_maintainer">Zisan</string>
+   <string name="beryllium_maintainer">horizon2000</string>
    <string name="device_olives">Xiaomi Redmi 8 Series</string>
    <string name="olives_maintainer">0xCAFEBABE</string>
    <string name="device_pine">Xiaomi Redmi 7A</string>

res/values/plurals.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 FlamingoOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- App Lock -->
+    <plurals name="app_lock_summary">
+        <item quantity="one"><xliff:g example="1" id="Number of applications">%1$d</xliff:g> application is protected</item>
+        <item quantity="other"><xliff:g example="10" id="Number of applications">%1$d</xliff:g> applications are protected</item>
+    </plurals>
+
+</resources>

res/xml/app_lock_package_config_settings.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 CherishOS 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"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/app_lock_title">
+
+    <Preference
+        android:key="app_lock_packages"
+        android:title="@string/app_lock_packages_title"
+        android:summary="@string/app_lock_packages_summary"
+        android:fragment="com.cherish.settings.security.applock.AppLockPackageListFragment" />
+
+    <ListPreference
+        android:key="app_lock_timeout"
+        android:title="@string/app_lock_timeout_title"
+        android:summary="@string/app_lock_timeout_summary"
+        android:entries="@array/app_lock_timeout_entries"
+        android:entryValues="@array/app_lock_timeout_values"
+        android:defaultValue="0"
+        android:persistent="false"
+        settings:controller="com.cherish.settings.security.applock.AppLockTimeoutPreferenceController" />
+
+    <SwitchPreference
+        android:key="app_lock_biometrics_allowed"
+        android:title="@string/app_lock_biometrics_allowed_title"
+        android:persistent="false"
+        settings:controller="com.cherish.settings.security.applock.AppLockBiometricPreferenceController" />
+
+</PreferenceScreen>

res/xml/app_lock_package_list_settings.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 FlamingoOS 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"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/app_lock_packages_title">
+</PreferenceScreen>

res/xml/cherish_lockscreen_shortcuts.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The CherishOS 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"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/lockscreen_shortcuts">
-
-    <PreferenceCategory
-        android:key="lockscreen_tuner"
-        android:title="@string/ls_tuner">
-
-    <Preference
-            android:title="@string/lockscreen_tuner_title" >
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.systemui"
-                android:targetClass="com.android.systemui.tuner.LockscreenActivity" />
-    </Preference>
-
-    </PreferenceCategory>
-
-</PreferenceScreen>

res/xml/cherish_maintainers.xml

@@ -81,7 +81,7 @@
             android:icon="@drawable/ic_devs_phone" >
             <intent
                 android:action="android.intent.action.VIEW"
-                android:data="https://t.me/xisan" />
+                android:data="https://t.me/horizon2000" />
         </Preference>
 
 <Preference
@@ -287,7 +287,7 @@
             android:icon="@drawable/ic_devs_phone" >
             <intent
                 android:action="android.intent.action.VIEW"
-                android:data="https://t.me/masarou" />
+                android:data="https://t.me/dinhsan2k" />
         </Preference>
 
 <Preference

res/xml/cherish_settings_animations.xml

@@ -20,37 +20,42 @@
     android:title="@string/animations_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
 	
-	<PreferenceCategory
-        android:key="quick_settings_animations"
-        android:title="@string/qs_tile_animation_title">
+	<ListPreference
+        android:key="power_menu_animations"
+        android:title="@string/power_menu_animation_title"
+        android:dialogTitle="@string/power_menu_animation_dialog_title"
+        android:entries="@array/power_menu_animations_entries"
+        android:entryValues="@array/power_menu_animations_values"
+        android:summary="%s"
+        android:persistent="false" />
 
-        <ListPreference
-            android:key="qs_tile_animation_style"
+    <PreferenceCategory
+      android:title="@string/qs_tile_animation_category_title">
+
+        <com.cherish.settings.preferences.SystemSettingIntListPreference
+            android:key="anim_tile_style"
             android:title="@string/qs_tile_animation_style_title"
             android:entries="@array/qs_tile_animation_style_entries"
             android:entryValues="@array/qs_tile_animation_style_values"
-            android:persistent="false" />
+            android:summary="%s"
+            android:defaultValue="0" />
 
-        <ListPreference
-            android:key="qs_tile_animation_duration"
+        <com.cherish.settings.preferences.SystemSettingIntListPreference
+            android:key="anim_tile_duration"
             android:title="@string/qs_tile_animation_duration_title"
             android:entries="@array/qs_tile_animation_duration_entries"
             android:entryValues="@array/qs_tile_animation_duration_values"
-            android:persistent="false" />
+            android:summary="%s"
+            android:defaultValue="2000" />
 
-        <ListPreference
-            android:key="qs_tile_animation_interpolator"
+        <com.cherish.settings.preferences.SystemSettingIntListPreference
+            android:key="anim_tile_interpolator"
             android:title="@string/qs_tile_animation_interpolator_title"
             android:entries="@array/qs_tile_animation_interpolator_entries"
             android:entryValues="@array/qs_tile_animation_interpolator_values"
-            android:persistent="false" />
-    </PreferenceCategory>
-	
-	<com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="screen_off_animation"
-            android:title="@string/screen_off_animation_title"
-            android:entries="@array/screen_off_animation_entries"
-            android:entryValues="@array/screen_off_animation_values"
             android:summary="%s"
             android:defaultValue="0" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>

res/xml/cherish_settings_app_lock.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 FlamingoOS 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"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/app_lock_title">
+
+    <Preference
+        android:key="app_lock_packages"
+        android:title="@string/app_lock_packages_title"
+        android:summary="@string/app_lock_packages_summary"
+        android:fragment="com.cherish.settings.security.applock.AppLockPackageListFragment" />
+
+    <ListPreference
+        android:key="app_lock_timeout"
+        android:title="@string/app_lock_timeout_title"
+        android:summary="@string/app_lock_timeout_summary"
+        android:entries="@array/app_lock_timeout_entries"
+        android:entryValues="@array/app_lock_timeout_values"
+        android:defaultValue="0"
+        android:persistent="false"
+        settings:controller="com.cherish.settings.security.applock.AppLockTimeoutPreferenceController" />
+
+    <SwitchPreference
+        android:key="app_lock_biometrics_allowed"
+        android:title="@string/app_lock_biometrics_allowed_title"
+        android:persistent="false" />
+
+</PreferenceScreen>

res/xml/cherish_settings_button.xml

@@ -18,14 +18,14 @@
         android:title="@string/button_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 		
-		<SwitchPreference
+	<SwitchPreference
         android:key="navbar_visibility"
         android:title="@string/navigation_bar_title"
         android:summary="@string/navigation_bar_summary" />
 
     <PreferenceCategory
-        android:key="navigation_keys"
-        android:title="@string/navigation_title"
+        android:key="navbar_layout_category"
+        android:title="@string/navbar_layout_category_title"
         android:dependency="navbar_visibility">
 
         <Preference
@@ -35,11 +35,17 @@
             settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"
             settings:keywords="@string/keywords_system_navigation" />
 
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        <!-- com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="navigation_bar_menu_arrow_keys"
             android:title="@string/navigation_bar_arrow_keys_title"
             android:summary="@string/navigation_bar_arrow_keys_summary"
-            android:defaultValue="false" />
+            android:defaultValue="false" />-->
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="navigation_bar_compact_layout"
+            android:title="@string/navigation_bar_compact_layout_title"
+            android:summary="@string/navigation_bar_compact_layout_summary"
+            android:defaultValue="false" />-->
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="navigation_bar_inverse"
@@ -47,34 +53,38 @@
             android:defaultValue="0"
             settings:controller="com.cherish.settings.fragments.NavBarInversePreferenceController" />
 
-        <com.android.settingslib.widget.FooterPreference
-            android:key="navigation_bar_footer_preference"
-            android:selectable="false"
-            android:title="@string/navigation_bar_help_text" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="volume_category"
         android:title="@string/volume_category">
 
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="volume_panel_on_left"
+            android:title="@string/volume_panel_on_left_title"
+            android:summary="@string/volume_panel_on_left_summary"
+            android:defaultValue="false" />
+
         <Preference
             android:key="vol_steps"
             android:title="@string/volume_steps_fragment_title"
             android:summary="@string/volume_steps_summary"
-            android:fragment="com.cherish.settings.fragments.VolumeStepsFragment" />
+            android:fragment="com.cherish.settings.fragments.VolumeRockerSettings" />
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="swap_volume_buttons"
-        android:title="@string/swap_volume_buttons_title"
-        android:summary="@string/swap_volume_buttons_summary"
-        android:defaultValue="false" />
+            android:key="volume_rocker_wake"
+            android:summary="@string/volume_rocker_wake_summary"
+            android:title="@string/volume_rocker_wake_title"
+            android:defaultValue="false" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="volume_rocker_wake"
-        android:summary="@string/volume_rocker_wake_summary"
-        android:title="@string/volume_rocker_wake_title"
-        android:defaultValue="false" />
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="volume_key_cursor_control"
+            android:summary="%s"
+            android:title="@string/volume_key_cursor_control_title"
+            android:dialogTitle="@string/volume_key_cursor_control_title"
+            android:entries="@array/volume_key_cursor_control_entries"
+            android:entryValues="@array/volume_key_cursor_control_values"
+            android:defaultValue="0" />
 
     </PreferenceCategory>
 
@@ -86,17 +96,21 @@
             android:key="hardware_keys_disable"
             android:title="@string/hardware_keys_disable_title" />
 
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="swap_capacitive_keys"
+            android:title="@string/swap_capacitive_keys_title"
+            android:summary="@string/swap_capacitive_keys_summary"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
 
-    <PreferenceCategory
+    <!-- PreferenceCategory
         android:key="button_backlight_options_category"
         android:title="@string/button_backlight_options_category">
-
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="button_backlight_enable"
             android:title="@string/button_backlight_enable_title"
             android:defaultValue="true" />
-
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="custom_button_use_screen_brightness"
             android:title="@string/button_link_brightness"
@@ -104,7 +118,6 @@
             android:defaultValue="false"
             android:dependency="button_backlight_enable"
             android:disableDependentsState="true" />
-
         <com.cherish.settings.preferences.CustomSeekBarPreference
             android:key="button_manual_brightness_new"
             android:title="@string/button_manual_brightness"
@@ -112,7 +125,6 @@
             settings:min="1"
             android:persistent="false"
             android:dependency="custom_button_use_screen_brightness" />
-
         <com.cherish.settings.preferences.CustomSeekBarPreference
             android:key="button_timeout"
             android:title="@string/button_timeout_title"
@@ -120,15 +132,13 @@
             settings:min="0"
             android:persistent="false"
             android:dependency="button_backlight_enable" />
-
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="button_backlight_on_touch_only"
             android:title="@string/button_backlight_on_touch_only_title"
             android:summary="@string/button_backlight_on_touch_only_summary"
             android:defaultValue="false"
             android:dependency="button_backlight_enable" />
-
-    </PreferenceCategory>
+    </PreferenceCategory>-->
 
     <PreferenceCategory
         android:key="back_key"
@@ -249,12 +259,6 @@
         </com.cherish.settings.preferences.ActionPreference>
 
     </PreferenceCategory>
-	
-	<ListPreference
-        android:key="torch_power_button_gesture"
-        android:title="@string/torch_power_button_gesture_title"
-        android:entries="@array/torch_power_button_gesture_entries"
-        android:entryValues="@array/torch_power_button_gesture_values" />
 
 
 </PreferenceScreen>

res/xml/cherish_settings_edge_light.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 FlamingoOS 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/edge_light_title">
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="edge_light_intro"
+        android:title="@string/edge_light_intro_text"
+        android:selectable="false"
+        android:persistent="false" />
+
+    <com.cherish.settings.preferences.SystemSettingMainSwitchPreference
+        android:key="edge_light_enabled"
+        android:title="@string/enable_edge_light"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="edge_light_always_trigger_on_pulse"
+        android:title="@string/edge_light_always_trigger_on_pulse_title"
+        android:summary="@string/edge_light_always_trigger_on_pulse_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="edge_light_repeat_animation"
+        android:title="@string/edge_light_repeat_animation_title"
+        android:summaryOn="@string/edge_light_repeat_animation_summary_on"
+        android:summaryOff="@string/edge_light_repeat_animation_summary_off"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="edge_light_color_mode"
+        android:title="@string/edge_light_color_mode_title"
+        android:entries="@array/edge_light_color_mode_entries"
+        android:entryValues="@array/edge_light_color_mode_values"
+        android:summary="%s"
+        android:defaultValue="0" />
+
+    <net.margaritov.preference.colorpicker.ColorPickerPreference
+        android:key="edge_light_custom_color"
+        android:title="@string/edge_light_custom_color_title"
+        android:defaultValue="0xffffff" />
+
+</PreferenceScreen>

res/xml/cherish_settings_lockscreen.xml

@@ -20,55 +20,134 @@
 	
 	<PreferenceCategory
         android:title="@string/lockscreen_gesture_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="double_tap_sleep_lockscreen"
-            android:title="@string/double_tap_to_sleep_lockscreen_title"
-            android:summary="@string/double_tap_to_sleep_lockscreen_summary"
-            android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="doze_pulse_on_double_tap"
-        android:title="@string/double_tap_on_doze_to_wake_title"
-        android:summary="@string/double_tap_on_doze_to_wake_summary"
-        android:defaultValue="true" />
-
-    </PreferenceCategory>
 	
-	 <Preference
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="double_tap_sleep_lockscreen"
+            android:title="@string/double_tap_sleep_lockscreen_title"
+            android:summary="@string/double_tap_sleep_lockscreen_summary"
+            android:defaultValue="true" />
+			
+	<ListPreference
+        android:key="torch_power_button_gesture"
+        android:title="@string/torch_power_button_gesture_title"
+        android:entries="@array/torch_power_button_gesture_entries"
+        android:entryValues="@array/torch_power_button_gesture_values" />
+			
+	<Preference
+            android:key="edge_light_enabled"
+            android:title="@string/edge_light_title"
+            android:summary="@string/edge_light_intro_text"
+            android:fragment="com.cherish.settings.fragments.EdgeLightSettings" />
+			
+	<com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="power_menu_hide_on_secure"
+            android:title="@string/power_menu_hide_on_secure_title"
+            android:summary="@string/power_menu_hide_on_secure_summary"
+            android:defaultValue="false" />
+			
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="hide_lockscreen_status_bar"
+            android:title="@string/hide_lockscreen_status_bar_title"
+            android:summary="@string/hide_lockscreen_status_bar_summary"
+            android:defaultValue="false" />
+			
+	</PreferenceCategory>
+	
+	<Preference
         android:key="always_on_display_schedule"
         android:title="@string/always_on_display_schedule_title"
         android:fragment="com.cherish.settings.fragments.AODSchedule" />
-		
+	
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="use_secondary_color_clock"
-            android:title="@string/lockscreen_clock_color_title"
-            android:summary="@string/lockscreen_clock_color_summary"
-            android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="enable_ripple_effect"
-        android:title="@string/enable_fingerprint_ripple_effect_title"
-        android:summary="@string/enable_fingerprint_ripple_effect_summary"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="lockscreen_battery_info"
-        android:title="@string/lockscreen_battery_info_title"
-        android:summary="@string/lockscreen_battery_info_summary"
+        android:title="@string/lockscreen_charging_info_title"
+        android:summary="@string/lockscreen_charging_info_summary"
         android:defaultValue="true" />
 		
 	<PreferenceCategory
-        android:key="lockscreen_media_category"
-        android:title="@string/lockscreen_media_category">
+        android:title="@string/lock_screen_custom_clock_face_category">
+
+        <ListPreference
+            android:key="lock_screen_custom_clock_face"
+            android:summary="%s"
+            android:title="@string/lock_screen_custom_clock_face_title"
+            android:entries="@array/lock_screen_custom_clock_face_entries"
+            android:entryValues="@array/lock_screen_custom_clock_face_values" />
+	
+	<SwitchPreference
+        android:key="kg_custom_clock_color_enabled"
+        android:title="@string/lockscreen_clock_color_title"
+        android:summary="@string/lockscreen_clock_color_summary"
+        android:defaultValue="true" />
+
+    <net.margaritov.preference.colorpicker.SecureSettingColorPickerPreference
+        android:key="kg_custom_clock_color"
+        android:title="@string/kg_custom_clock_color_title"
+        android:defaultValue="0xFFFFFFFF"
+        android:dependency="kg_custom_clock_color_enabled"/>
+
+    <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="kg_custom_clock_font"
+        android:title="@string/kg_custom_clock_font_title"
+        android:entries="@array/kg_custom_clock_font_entries"
+        android:entryValues="@array/kg_custom_clock_font_values"
+        android:defaultValue="23"/>
+
+    <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="kg_custom_date_font"
+        android:title="@string/kg_custom_date_font_title"
+        android:entries="@array/kg_custom_clock_font_entries"
+        android:entryValues="@array/kg_custom_clock_font_values"
+        android:defaultValue="23"/>
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="small_clock_double_line"
+        android:title="@string/small_clock_doubleline_title"
+        android:summary="@string/small_clock_doubleline_summary"
+        android:defaultValue="true" />
+		
+	</PreferenceCategory>
+	
+	<PreferenceCategory
+        android:title="@string/weather_title">
+
+       <Preference
+            android:key="omnijaws_settings"
+            android:title="@string/qs_weather_settings_title"
+            android:summary="@string/qs_weather_settings_summary"
+            android:fragment="com.cherish.settings.fragments.OmniJawsSettings" />
+    </PreferenceCategory>
+	
+	<!-- Udfps options -->
+    <PreferenceCategory
+        android:key="udfps_category"
+        android:title="@string/udfps_category">
+
+        <Preference
+            android:key="udfps_settings"
+            android:title="@string/udfps_settings_title"
+            android:summary="@string/udfps_settings_summary"
+            android:fragment="com.cherish.settings.fragments.Udfps" />
+
+    </PreferenceCategory>
+	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="enable_ripple_effect"
+            android:title="@string/enable_fingerprint_ripple_effect_title"
+            android:summary="@string/enable_fingerprint_ripple_effect_summary"
+            android:defaultValue="true" />
+	
+	<PreferenceCategory
+        android:key="lockscreen_media_art_options"
+        android:title="@string/lockscreen_media_art_options_title">
 
         <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="lockscreen_media_metadata"
             android:title="@string/media_art_title"
             android:summary="@string/media_art_summary"
             android:defaultValue="true" />
-			
-		 <com.cherish.settings.preferences.SystemSettingListPreference
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="lockscreen_albumart_filter"
             android:title="@string/lockscreen_albumart_filter_title"
             android:entries="@array/lockscreen_albumart_filter_entries"
@@ -83,29 +162,13 @@
         android:summary="@string/pulse_settings_summary"
         android:fragment="com.cherish.settings.fragments.sound.PulseSettings" />
 
+        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="ls_media_filter_blur_radius"
+            android:title="@string/lockscreen_albumart_filter_blur_radius_title"
+            android:defaultValue="10"
+            android:max="25"
+            settings:min="1" />
+
     </PreferenceCategory>
 
-	<!-- <PreferenceCategory
-        android:key="lockscreen_category"
-        android:title="@string/ls_category">
-
-         <Preference
-            android:key="lockscreen_shortcuts"
-            android:fragment="com.cherish.settings.fragments.LockscreenShortcuts"
-            android:title="@string/lockscreen_shortcuts"
-            android:summary="@string/ls_shortcut_summary" />
-
-    </PreferenceCategory> -->
-	
-	<PreferenceCategory
-        android:key="udfps_category"
-        android:title="@string/udfps_category">
-
-        <Preference
-            android:key="udfps_settings"
-            android:title="@string/udfps_settings_title"
-            android:summary="@string/udfps_settings_summary"
-            android:fragment="com.cherish.settings.fragments.UdfpsSettings" />
-			
-	</PreferenceCategory>
 </PreferenceScreen>

res/xml/cherish_settings_misc.xml

@@ -18,73 +18,64 @@
         android:title="@string/misc_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="charging_animation"
-            android:title="@string/charging_animation_title"
-            android:summary="@string/charging_animation_summary"
-            android:defaultValue="false" />
+		<!-- Launch music player when headset is connected -->
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="headset_connect_player"
+        android:title="@string/headset_connect_player_title"
+        android:summary="@string/headset_connect_player_summary"
+        android:defaultValue="false" />
 			
 	<com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="window_ignore_secure"
         android:title="@string/laboratory_ignore_window_secure_title"
         android:summary="@string/laboratory_ignore_window_secure_summary"
         android:defaultValue="false"/>
-			
-	<com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="pm_downgrade_allowed"
-        android:title="@string/laboratory_app_downgrade_title"
-        android:summary="@string/laboratory_app_downgrade_summary"
-        android:defaultValue="false"/>
+		
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="click_partial_screenshot"
+        android:title="@string/click_partial_screenshot_title"
+        android:summary="@string/click_partial_screenshot_summary"
+        android:defaultValue="false" />
 
-        <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-        android:key="strict_standby_policy"
-        android:title="@string/strict_standby_policy_title"
-        android:summary="@string/strict_standby_policy_summary"
-        android:defaultValue="false"/>
-
-        <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-        android:key="force_background_freezer"
-        android:title="@string/force_background_freezer_title"
-        android:summary="@string/force_background_freezer_summary"
-        settings:controller="com.cherish.settings.preferences.ForceBackgroundFreezePreferenceController"
-        android:defaultValue="false"/>
-	
-		<!-- Gaming mode -->
+     <Preference
+        android:key="app_lock"
+        android:title="@string/app_lock_title"
+        android:summary="@string/app_lock_summary"
+        android:fragment="com.cherish.settings.security.applock.AppLockSettingsFragment"
+        settings:controller="com.cherish.settings.security.applock.AppLockSettingsPreferenceController" />
+		
+	<!-- Smart Charging -->
     <Preference
-        android:key="gaming_mode"
-        android:title="@string/gaming_mode_title"
-        android:summary="@string/gaming_mode_summary">
+        android:key="smart_charging"
+        android:title="@string/smart_charging_title"
+        android:summary="@string/smart_charging_summary"
+        android:fragment="com.cherish.settings.fragments.SmartCharging"/>
+		
+	<!-- Squiggle animation -->
+    <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        android:key="show_media_squiggle_animation"
+        android:title="@string/show_squiggle_animation_title"
+        android:summary="@string/show_squiggle_animation_summary"
+        android:defaultValue="true" />
 
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="io.chaldeaprjkt.gamespace"
-            android:targetClass="io.chaldeaprjkt.gamespace.settings.SettingsActivity" />
-    </Preference>
-	
-	<PreferenceCategory
-        android:key="spoof_category"
-        android:title="@string/spoof_title">
+		
+	<!-- Unlock FPS for specific games -->
+     <SwitchPreference
+          android:key="use_games_spoof"
+          android:title="@string/use_games_spoof_title"
+          android:summary="@string/use_games_spoof_summary" />
 
-        <!-- Unlimited Photos storage -->
-        <SwitchPreference
-            android:key="use_photos_spoof"
-            android:title="@string/use_photos_spoof_title"
-            android:summary="@string/use_photos_spoof_summary"
-            android:defaultValue="true" />
-
-        <!-- Unlock FPS for specific games -->
-        <SwitchPreference
-            android:key="use_games_spoof"
-            android:title="@string/use_games_spoof_title"
-            android:summary="@string/use_games_spoof_summary" />
-
-        <!-- Unlock higher quality streams for specific apps -->
-        <SwitchPreference
-            android:key="use_stream_spoof"
-            android:title="@string/use_stream_spoof_title"
-            android:summary="@string/use_stream_spoof_summary"
-            android:defaultValue="true" />
-
-    </PreferenceCategory>
+      <!--Netflix -->
+    <SwitchPreference
+        android:key="use_netflix_spoof"
+        android:title="@string/netflix_spoof_title"
+        android:summary="@string/netflix_spoof_summary"/>
+		  
+	<!-- Unlimited Photos storage -->
+     <SwitchPreference
+          android:key="use_photos_spoof"
+          android:title="@string/use_photos_spoof_title"
+          android:summary="@string/use_photos_spoof_summary"
+          android:defaultValue="true" />
 		
 </PreferenceScreen>

res/xml/cherish_settings_monet.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020-22 The CherishOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/monet_engine_title">
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_custom_color"
-        android:title="@string/monet_engine_custom_color_title"
-        android:summary="@string/monet_engine_custom_color_summary"
-        android:defaultValue="false" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="monet_engine_color_override"
-        android:title="@string/monet_engine_color_override_title"
-        android:dependency="monet_engine_custom_color"
-        android:defaultValue="0xffffff" />
-
-    <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-        android:key="monet_engine_white_luminance_user"
-        android:title="@string/monet_engine_white_luminance_user_title"
-        android:defaultValue="425"
-        android:max="1000"
-        settings:min="200"
-        settings:interval="25"/>
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_accurate_shades"
-        android:title="@string/monet_engine_accurate_shades_title"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-        android:key="monet_engine_chroma_factor"
-        android:title="@string/monet_engine_chroma_factor_title"
-        android:defaultValue="100"
-        android:max="400"
-        settings:min="50"
-        settings:interval="25"/>
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_linear_lightness"
-        android:title="@string/monet_engine_linear_lightness_title"
-        android:defaultValue="false" />
-</PreferenceScreen>

res/xml/cherish_settings_network_traffic.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2022 The CherishOS 
+     SPDX-License-Identifier: Apache-2.0
+-->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/network_traffic_title">
+
+    <com.cherish.settings.preferences.SystemSettingMainSwitchPreference
+        android:key="network_traffic_state"
+        android:title="@string/network_traffic_master_switch_title"
+        android:defaultValue="false" />
+
+    <PreferenceCategory
+        android:title="@string/network_options_title">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="network_traffic_autohide_threshold"
+            android:title="@string/network_traffic_autohide_title"
+            android:summary="@string/network_traffic_autohide_summary"
+            android:dependency="network_traffic_state"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>

res/xml/cherish_settings_notifications.xml

@@ -18,7 +18,7 @@
 	android:title="@string/notifications_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <PreferenceCategory
+    <!-- <PreferenceCategory
         android:key="incall_vib_options"
         android:title="@string/incall_vibration_category">
 
@@ -40,137 +40,97 @@
             android:title="@string/incall_vibrate_disconnect_title"
             android:defaultValue="true" />
 
-    </PreferenceCategory>
-	
-	<PreferenceCategory
-        android:title="@string/flashlight_category">
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="flashlight_on_call"
-            android:title="@string/flashlight_on_call_title"
-            android:entries="@array/flashlight_on_call_entries"
-            android:entryValues="@array/flashlight_on_call_values"
-            android:defaultValue="0" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="flashlight_on_call_ignore_dnd"
-            android:title="@string/flashlight_on_call_ignore_dnd_title"
-            android:summary="@string/flashlight_on_call_ignore_dnd_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.CustomSeekBarPreference
-            android:key="flashlight_on_call_rate"
-            android:title="@string/flashlight_on_call_rate_title"
-            android:summary="@string/flashlight_on_call_rate_summary"
-            android:max="5"
-            settings:min="1"
-            settings:defaultValue="1"
-            settings:units="Hz" />
-    </PreferenceCategory>
-	
-	<PreferenceCategory
-           android:key="notifications_general_category"
-           android:title="@string/general_category">
-		   
-		 <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="reticker_status"
-        android:title="@string/reticker_title"
-        android:summary="@string/reticker_summary" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="reticker_colored"
-        android:title="@string/reticker_colored_title"
-        android:summary="@string/reticker_colored_summary"
-        android:dependency="reticker_status" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-           android:key="notification_guts_kill_app_button"
-           android:title="@string/notification_guts_kill_app_button_title"
-           android:summary="@string/notification_guts_kill_app_button_summary"
-           android:defaultValue="false" />
-    </PreferenceCategory>
-	
-	<PreferenceCategory
-        android:title="@string/media_category">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="media_artwork_enabled"
-            android:title="@string/artwork_media_background_title"
-            android:summary="@string/artwork_media_background_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="media_artwork_fade_percent"
-            android:title="@string/artwork_media_background_fade_filter_title"
-            android:dependency="media_artwork_enabled"
-            android:defaultValue="30"
-            android:max="50"
-            settings:min="1" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="media_artwork_blur_enabled"
-            android:title="@string/artwork_media_background_enable_blur_title"
-            android:dependency="media_artwork_enabled"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="media_artwork_blur_radius"
-            android:title="@string/artwork_media_background_blur_radius_title"
-            android:dependency="media_artwork_blur_enabled"
-            android:defaultValue="1"
-            android:max="25"
-            settings:min="1" />
-
-    </PreferenceCategory>
+    </PreferenceCategory> -->
 	
 	<Preference
         android:key="charging_light"
         android:fragment="com.cherish.settings.fragments.BatteryLightSettings"
         android:title="@string/battery_light_settings" />
 		
-	<!-- Pulse notifications lightning -->
-    <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-        android:key="pulse_ambient_light"
-        android:title="@string/pulse_ambient_light_title"
-        android:summary="@string/pulse_ambient_light_summary"
-        android:fragment="com.cherish.settings.fragments.EdgeLightningSettings"
+	<PreferenceCategory
+        android:key="notifications_category"
+        android:title="@string/notifications_category_title">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="less_boring_heads_up"
+            android:title="@string/less_boring_heads_up_title"
+            android:summary="@string/less_boring_heads_up_summary"
+            android:defaultValue="false" />
+			
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="notification_sound_vib_screen_on"
+            android:title="@string/notification_sound_vib_screen_on_title"
+            android:summary="@string/notification_sound_vib_screen_on_summary"
+            android:defaultValue="true" />
+			
+		<!-- Alert Slider Notifications -->
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="alert_slider_notifications"
+        android:title="@string/alert_slider_notifications_title"
+        android:summary="@string/alert_slider_notifications_summary"
+        android:defaultValue="true" />
+		
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="notification_guts_kill_app_button"
+            android:title="@string/notification_guts_kill_app_button_title"
+            android:summary="@string/notification_guts_kill_app_button_summary"
+            android:defaultValue="false" />
+			
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="toast_icon"
+            android:order="24"
+            android:title="@string/toast_icon_title"
+            android:summary="@string/toast_icon_summary"
+            android:defaultValue="true"/>
+			
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="reticker_status"
+        android:title="@string/reticker_title"
+        android:summary="@string/reticker_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:dependency="reticker_status"
+        android:key="reticker_colored"
+        android:title="@string/reticker_colored_title"
+        android:summary="@string/reticker_colored_summary"
         android:defaultValue="false" />
 		
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="pulse_on_new_tracks"
-        android:title="@string/pulse_on_new_tracks_title"
-        android:summary="@string/pulse_on_new_tracks_summary"
-        android:defaultValue="true" />
-	
-	<PreferenceCategory
-        android:key="headsup_notifications_category"
-        android:title="@string/headsup_category">
+            android:key="new_reticker"
+            android:dependency="reticker_status"
+            android:title="@string/new_reticker_title"
+            android:summary="@string/new_reticker_summary"
+            android:defaultValue="false" />
 
-     <Preference
-        android:key="heads_up_notifications"
-        android:summary="@string/heads_up_notifications_summary"
-        android:title="@string/heads_up_notifications"
-        android:fragment="com.cherish.settings.fragments.HeadsUpSettings"/>
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="less_boring_heads_up"
-        android:title="@string/less_boring_heads_up_title"
-        android:summary="@string/less_boring_heads_up_summary"
-        android:defaultValue="false" />
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="new_reticker_animation"
+            android:dependency="reticker_status"
+            android:title="@string/new_reticker_animation_title"
+            android:summary="@string/new_reticker_animation_summary"
+            android:defaultValue="false" />
 
     </PreferenceCategory>
 	
-	 <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="notification_headers"
-        android:title="@string/notification_headers_title"
-        android:summary="@string/notification_headers_summary"
-        android:defaultValue="true" />
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="toast_icon"
-            android:title="@string/toast_icon_title"
-            android:summary="@string/toast_icon_summary"
+	<PreferenceCategory
+        android:key="incall_vib_options"
+        android:title="@string/incall_vibration_category" >
+
+         <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="vibrate_on_connect"
+            android:title="@string/incall_vibrate_connect_title"
             android:defaultValue="false" />
+
+         <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="vibrate_on_callwaiting"
+            android:title="@string/incall_vibrate_call_wait_title"
+            android:defaultValue="false" />
+
+         <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="vibrate_on_disconnect"
+            android:title="@string/incall_vibrate_disconnect_title"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
 	
-    
 </PreferenceScreen>

res/xml/cherish_settings_power.xml

@@ -18,11 +18,19 @@
     android:title="@string/powermenu_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="lockscreen_power_menu_disabled"
-            android:title="@string/lockscreen_power_menu_disabled_title"
-            android:summary="@string/lockscreen_power_menu_disabled_summary"
-            android:defaultValue="true" />
+	<com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="transparent_power_menu"
+            android:title="@string/power_menu_transparency"
+            android:max="100"
+            android:min="0"
+            android:defaultValue="100" />
+
+        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="transparent_power_dialog_dim"
+            android:title="@string/power_menu_dialog_dim"
+            android:max="100"
+            android:min="0"
+            android:defaultValue="50" />
 	
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="powermenu_power"

res/xml/cherish_settings_quicksettings.xml

@@ -19,71 +19,46 @@
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
   <PreferenceCategory
-        android:title="@string/qs_title">
+        android:title="@string/qs_category">
 		
+		<com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="qs_transparency"
+            android:title="@string/qs_transparency_title"
+            android:summary="@string/qs_transparency_summary"
+            android:defaultValue="100"
+            settings:interval="1"
+            settings:units="%"
+            android:max="100"
+            android:min="1" />
 		
-	<com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="qs_transparency"
-        android:title="@string/qs_transparency_title"
-        android:summary="@string/qs_transparency_summary"
-        android:defaultValue="100"
-        settings:interval="1"
-        settings:units="%"
-        android:max="100"
-        android:min="1" />
-		
-	  
-	<!-- QS date -->
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="show_qs_date"
-            android:title="@string/qs_date_title"
-            android:summary="@string/qs_date_summary"
-            android:defaultValue="true" />
-			
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_footer_data_usage"
-            android:title="@string/qs_footer_datausage_title"
-            android:summary="@string/qs_footer_datausage_summary"
-            android:defaultValue="false" />
-		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_show_battery_estimate"
-            android:title="@string/qs_show_battery_estimate_title"
-            android:summary="@string/qs_show_battery_estimate_summary"
-            android:defaultValue="true"/>
-		
-		<com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="enable_camera_privacy_indicator"
-            android:title="@string/mic_camera_privacy_indicator_title"
-            android:summary="@string/mic_camera_privacy_indicator_summary"
-            android:defaultValue="true" />
-
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="enable_location_privacy_indicator"
-            android:title="@string/location_privacy_indicator_title"
-            android:summary="@string/location_privacy_indicator_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="quick_settings_vibrate"
-            android:title="@string/quick_settings_vibrate_title"
-            android:summary="@string/quick_settings_vibrate_summary"
-            android:defaultValue="false"/>
-			
 		<ListPreference
             android:key="status_bar_quick_qs_pulldown"
             android:title="@string/status_bar_quick_qs_pulldown"
             android:entries="@array/quick_pulldown_entries"
             android:entryValues="@array/quick_pulldown_values"
             android:defaultValue="0" />
+			
+		<com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="qs_header_clock_size"
+            android:title="@string/clock_font_size_title"
+            android:max="27"
+            settings:min="10"
+            settings:interval="1"
+            android:defaultValue="14"
+            settings:units="@string/unit_pixels" />
+			
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="show_qs_date"
+            android:title="@string/qs_date_title"
+            android:summary="@string/qs_date_summary"
+            android:defaultValue="true" />
 
     </PreferenceCategory>
 	
 	<PreferenceCategory
         android:key="quick_settings_brighness_category"
-        android:title="@string/qs_brightness_slider_category">
+        android:title="@string/qs_show_brightness_slider_title">
 
-        <!-- Brightness slider -->
         <com.cherish.settings.preferences.SecureSettingListPreference
             android:key="qs_show_brightness_slider"
             android:title="@string/qs_show_brightness_slider_title"
@@ -107,35 +82,101 @@
     </PreferenceCategory>
 	
 	<PreferenceCategory
-        android:key="tile_layout_category"
-        android:title="@string/qs_tile_layout_category_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_tile_label_hide"
-            android:title="@string/qs_tile_title_visibility_title"
-            android:summary="@string/qs_tile_title_visibility_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="qs_tile_vertical_layout"
-            android:title="@string/qs_tile_layout_title"
-            android:summary="@string/qs_tile_layout_summary"
-            android:defaultValue="false" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
         android:key="qs_layout_category"
         android:title="@string/qs_layout_category_title">
 
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="qs_layout_columns"
-            android:title="@string/qs_columns_portrait_title"
-            android:max="4"
-            settings:min="2"
-            settings:interval="1"
-            android:defaultValue="2" />
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+         android:key="qs_tile_label_hide"
+         android:title="@string/qs_tile_label_hide_title"
+         android:summary="@string/qs_tile_label_hide_summary"
+         android:defaultValue="false" />
+
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+         android:key="qs_tile_label_size"
+         android:title="@string/qs_tile_label_size_title"
+         android:max="15"
+         settings:min="10"
+         settings:interval="1"
+         settings:units="sp"
+         android:defaultValue="14" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+         android:key="qs_tile_vertical_layout"
+         android:title="@string/qs_tile_layout_title"
+         android:summary="@string/qs_tile_layout_summary"
+         android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+         android:key="qs_layout_columns"
+         android:title="@string/qs_columns_portrait_title"
+         android:max="5"
+         settings:min="2"
+         settings:interval="1"
+         android:defaultValue="2" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+         android:key="qs_layout_columns_landscape"
+         android:title="@string/qs_columns_landscape_title"
+         android:max="6"
+         settings:min="2"
+         settings:interval="1"
+         android:defaultValue="4" />
 
     </PreferenceCategory>
 
+	<PreferenceCategory
+        android:title="@string/qs_footer_category">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_data_usage"
+            android:title="@string/qs_footer_datausage_title"
+            android:summary="@string/qs_footer_datausage_summary"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+	
+	<PreferenceCategory 
+         android:title="@string/qs_footer_category">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_warnings"
+            android:title="@string/qs_footer_warnings_title"
+            android:summary="@string/qs_footer_warnings_summary"
+            android:defaultValue="true"/>
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_show_user"
+            android:title="@string/qs_footer_users_icon_title"
+            android:summary="@string/qs_footer_users_icon_summary"
+            android:defaultValue="true" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_data_usage"
+            android:title="@string/qs_footer_datausage_title"
+            android:summary="@string/qs_footer_datausage_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_show_edit"
+            android:title="@string/qs_footer_edit_icon_title"
+            android:defaultValue="true" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_show_power_menu"
+            android:title="@string/qs_footer_show_power_menu_title"
+            android:defaultValue="true" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_show_services"
+            android:title="@string/qs_footer_services_icon_title" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_footer_show_settings"
+            android:title="@string/qs_footer_settings_icon_title"
+            android:defaultValue="true" />
+
+    </PreferenceCategory>
+
+
 </PreferenceScreen>

res/xml/cherish_settings_status_bar_clock.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2020-2022 The CherishOS Project
+     Copyright (C) 2019-2022 The CherishOS Projects
      SPDX-License-Identifier: Apache-2.0
 -->
 <PreferenceScreen
@@ -57,6 +57,15 @@
         android:entryValues="@array/status_bar_am_pm_values"
         android:defaultValue="2" />
 
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="status_bar_clock_size"
+        android:title="@string/clock_font_size_title"
+        android:max="20"
+        settings:min="4"
+        settings:interval="1"
+        android:defaultValue="14"
+        settings:units="@string/unit_pixels" />
+
     <com.cherish.settings.preferences.SystemSettingListPreference
         android:key="status_bar_clock_date_display"
         android:title="@string/status_bar_date_title"
@@ -83,4 +92,4 @@
         android:title="@string/status_bar_date_format_title"
         android:entries="@array/status_bar_date_format_entries_values"
         android:entryValues="@array/status_bar_date_format_entries_values" />
-</PreferenceScreen>
+</PreferenceScreen>

res/xml/cherish_settings_statusbar.xml

@@ -15,26 +15,38 @@
     android:title="@string/statusbar_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 	
-	<PreferenceCategory
-        android:title="@string/statusbar_gesture_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="double_tap_sleep_gesture"
-            android:title="@string/double_tap_to_sleep_statusbar_title"
-            android:summary="@string/double_tap_to_sleep_statusbar_summary"
-            android:defaultValue="true" />
-
-    </PreferenceCategory>
 	
 	<PreferenceCategory
-        android:key="statusbar_icons"
-        android:title="@string/sb_icons">
+        android:title="@string/lockscreen_gesture_title">
+	
+	<com.cherish.settings.preferences.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" />
+			
+	</PreferenceCategory>
+	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="statusbar_clock_chip"
+        android:title="@string/statusbar_clock_chip_title"
+        android:summary="@string/statusbar_clock_chip_summary"
+        android:defaultValue="false" />
+	
+	<Preference
+        android:key="network_traffic_settings"
+        android:title="@string/network_traffic_title"
+        android:summary="@string/network_traffic_summary"
+        android:fragment="com.cherish.settings.fragments.NetworkTrafficSettings" />
 		
-		<Preference
-        android:key="traffic"
-        android:fragment="com.cherish.settings.fragments.Traffic"
-        android:title="@string/traffic_title"
-        android:summary="@string/traffic_summary" />
+	<Preference
+        android:key="battery_settings"
+        android:fragment="com.cherish.settings.fragments.StatusBarBattery"
+        android:title="@string/battery_style_title"
+        android:summary="@string/battery_style_summary" />
+		
+	<PreferenceCategory
+        android:title="@string/status_bar_icons_category_title">
 		
 		<com.cherish.settings.preferences.SystemSettingListPreference
         android:key="status_bar_clock"
@@ -44,24 +56,27 @@
         android:entries="@array/status_bar_clock_position_entries"
         android:entryValues="@array/status_bar_clock_position_values"
         android:defaultValue="2" />
-
-    <Preference
+		
+		<Preference
         android:key="clock"
         android:title="@string/status_bar_clock_title"
         android:summary="@string/status_bar_clock_summary"
         android:fragment="com.cherish.settings.fragments.Clock" />
-			
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+		
+		<Preference
+            android:key="status_bar_icons"
+            android:title="@string/status_bar_icons_title"
+            android:summary="@string/status_bar_icons_summary">
+            <intent android:action="android.intent.action.MAIN"
+                 android:targetPackage="com.android.systemui"
+                 android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
+        </Preference>
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="data_disabled_icon"
             android:title="@string/data_disabled_icon_title"
             android:summary="@string/data_disabled_icon_summary"
-            android:defaultValue="true"/>
-
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-             android:key="show_fourg_icon"
-             android:title="@string/show_fourg_icon_title"
-             android:summary="@string/show_fourg_icon_summary"
-             android:defaultValue="false"/>
+            android:defaultValue="true" />
 		
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="show_volte_icon"
@@ -77,8 +92,8 @@
          android:summary="%s"
          android:defaultValue="0"
          android:dependency="show_volte_icon"/>
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
+		 
+	<com.cherish.settings.preferences.SystemSettingListPreference
          android:key="vowifi_icon"
          android:title="@string/vowifi_icon_title"
          android:entries="@array/vowifi_icon_entries"
@@ -93,49 +108,68 @@
          android:entryValues="@array/vowifi_icon_style_values"
          android:summary="%s"
          android:defaultValue="0"/>
-		 
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="show_wifi_standard_icon"
-            android:title="@string/show_wifi_standard_icon_title"
-            android:summary="@string/show_wifi_standard_icon_summary"
-            android:defaultValue="false"/>
-			 
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-             android:key="roaming_indicator_icon"
-             android:title="@string/roaming_indicator_icon_title"
-             android:summary="@string/roaming_indicator_icon_summary"
-             android:defaultValue="true"/>
-			 
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="use_old_mobiletype"
             android:title="@string/use_old_mobiletype_title"
             android:summary="@string/use_old_mobiletype_summary"
-            android:defaultValue="false" />  
-
-           <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="show_combined_status_bar_signal_icons"
-        android:title="@string/combined_status_bar_signal_icons"
-        android:summary="@string/combined_status_bar_signal_icons_summary"
-        android:defaultValue="false" />	
+            android:defaultValue="false" />
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
-               android:key="statusbar_icons_style"
-               android:title="@string/statusbar_icons_style"
-               android:summary="@string/statusbar_icons_style_summary"
-               android:defaultValue="true" />
+            android:key="show_fourg_icon"
+            android:title="@string/show_fourg_icon_title"
+            android:summary="@string/show_fourg_icon_summary"
+            android:defaultValue="false" />
 
-        <Preference
-            android:key="battery_settings"
-            android:title="@string/battery_style_category_title"
-            android:fragment="com.cherish.settings.fragments.StatusBarBattery" />			   
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="roaming_indicator_icon"
+            android:title="@string/roaming_indicator_icon_title"
+            android:summary="@string/roaming_indicator_icon_summary"
+            android:defaultValue="false" />
+			
+		<com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="enable_camera_privacy_indicator"
+            android:title="@string/mic_camera_privacy_indicator_title"
+            android:summary="@string/mic_camera_privacy_indicator_summary"
+            android:defaultValue="true" />
 
-       <Preference
-            android:key="systemui_tuner_statusbar"
-            android:title="@string/statusbar_items_category" >
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.systemui"
-                android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
-        </Preference>
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="enable_location_privacy_indicator"
+            android:title="@string/location_privacy_indicator_title"
+            android:summary="@string/location_privacy_indicator_summary"
+            android:defaultValue="true" />
+
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="enable_projection_privacy_indicator"
+            android:title="@string/projection_privacy_indicator_title"
+            android:summary="@string/projection_privacy_indicator_summary"
+            android:defaultValue="true" />
+			
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+	        android:key="statusbar_notif_count"
+	        android:title="@string/statusbar_notif_count_title"
+	        android:summary="@string/statusbar_notif_count_summary"
+	        android:defaultValue="false" />
+			
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="statusbar_colored_icons"
+            android:title="@string/statusbar_colored_icons_title"
+            android:summary="@string/statusbar_colored_icons_summary"
+            android:defaultValue="false" />
+			
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="bluetooth_show_battery"
+        android:title="@string/bluetooth_battery_title"
+        android:summary="@string/bluetooth_battery_summary"
+        android:defaultValue="true"/>
+
+			
+		<!-- Birghtness control -->
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="status_bar_brightness_control"
+            android:title="@string/status_bar_brightness_control_title"
+            android:summary="@string/status_bar_brightness_control_summary"
+            android:defaultValue="false" />
 
     </PreferenceCategory>
 

res/xml/cherish_settings_theme.xml

@@ -18,7 +18,7 @@
         android:title="@string/theme_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 		
-	<PreferenceCategory
+		<PreferenceCategory
         android:key="settings_layout_category"
         android:title="@string/settings_layout_category_title">
 
@@ -48,49 +48,10 @@
             android:summary="@string/disable_usercard_summary"
             android:defaultValue="false" />
 
-    </PreferenceCategory>
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="system_black_theme"
-        android:title="@string/system_black_theme_title"
-        android:summary="@string/system_black_theme_summary"
-        android:defaultValue="false" />
-	
-	<PreferenceCategory
-        android:title="@string/notification_material_dismiss_button_title">
-
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="notification_material_dismiss"
-            android:title="@string/notification_material_dismiss_button_title"
-            android:summary="@string/notification_material_dismiss_button_summary"
-            android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="notification_material_dismiss_style"
-            android:title="@string/clearall_style_title"
-            android:dependency="notification_material_dismiss"
-            android:defaultValue="0"
-            android:max="9"
-            android:min="0" />
-
-        <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-            android:key="notification_material_dismiss_bgstyle"
-            android:title="@string/clearall_bgstyle_title"
-            android:dependency="notification_material_dismiss"
-            android:defaultValue="0"
-            android:max="4"   
-            android:min="0" />
-
     </PreferenceCategory>
 	
 	<PreferenceCategory
         android:title="@string/theme_customization_category">
-		
-		<Preference
-        android:key="monet_engine"
-        android:title="@string/monet_engine_title"
-        android:summary="@string/monet_engine_summary"
-        android:fragment="com.cherish.settings.fragments.MonetEngine" />
 
         <Preference
             android:key="dark_ui_mode"
@@ -98,6 +59,24 @@
             android:summary="@string/dark_ui_mode_summary"
             android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
             settings:controller="com.android.settings.display.DarkUIPreferenceController" />
+		
+	<com.cherish.settings.preferences.SecureSettingListPreference
+         android:key="system_custom_theme"
+         android:title="@string/custom_theme_title"
+         android:summary="@string/custom_theme_summary"
+         android:defaultValue="0"
+         android:entries="@array/custom_theme_entries"
+         android:entryValues="@array/custom_theme_values" />
+		 
+		 <!-- QS style -->
+    <com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="qs_panel_style"
+         android:title="@string/qs_styles_title"
+         android:dialogTitle="@string/qs_styles_title"
+         android:entries="@array/qs_styles_entries"
+         android:entryValues="@array/qs_styles_values"
+         android:summary="%s"
+         android:defaultValue="0" />
 
         <!-- Font style -->
         <Preference

res/xml/cherish_settings_traffic.xml

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2020-2022 The CherishOS 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
-    android:title="@string/traffic_title"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="network_traffic_location"
-        android:title="@string/network_traffic_location_title"
-        android:summary="%s"
-        android:entries="@array/network_traffic_location_entries"
-        android:entryValues="@array/network_traffic_location_values"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="network_traffic_autohide"
-        android:title="@string/network_traffic_autohide"
-        android:summary="@string/network_traffic_autohide_summary"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="network_traffic_autohide_threshold"
-        android:title="@string/network_traffic_autohide_threshold_title"
-        android:defaultValue="0"
-        android:max="10000"
-        settings:min="0"
-        settings:units="@string/network_traffic_autohide_kilobytes"
-        settings:interval="10"
-        android:dependency="network_traffic_autohide" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="network_traffic_mode"
-        android:title="@string/network_traffic_mode_title"
-        android:entries="@array/network_traffic_mode_entries"
-        android:entryValues="@array/network_traffic_mode_values"
-        android:summary="%s"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="network_traffic_refresh_interval"
-        android:title="@string/network_traffic_refresh_interval_title"
-        android:summary="@string/network_traffic_refresh_interval_summary"
-        android:defaultValue="2"
-        android:max="10"
-        settings:min="1"
-        settings:units="@string/unit_seconds" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="network_traffic_units"
-        android:title="@string/network_traffic_units_title"
-        android:entries="@array/network_traffic_units_entries"
-        android:entryValues="@array/network_traffic_units_values"
-        android:summary="%s"
-        android:defaultValue="1" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="network_traffic_hidearrow"
-        android:title="@string/network_traffic_hidearrow"
-        android:summary="@string/network_traffic_hidearrow_summary" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="network_traffic_font_size"
-        android:title="@string/network_traffic_font_size"
-        android:max="24"
-        settings:min="14"
-        settings:defaultValue="18"
-        settings:units="dp" />
-
-</PreferenceScreen>

res/xml/cherish_settings_udfps.xml

@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020-22 The CherishOS Projects
-     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.
+<!--
+     Copyright (C) 2019-2022 The CherishOS Projects
+     SPDX-License-Identifier: Apache-2.0
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-	android:title="@string/udfps_category">
+    android:title="@string/udfps_category">
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="udfps_haptic_feedback"
@@ -21,28 +14,29 @@
         android:summary="@string/udfps_haptic_feedback_summary"
         android:defaultValue="true" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="fingerprint_success_vib"
-        android:title="@string/fprint_sucess_vib_title"
-        android:summary="@string/fprint_sucess_vib_summary"
-        android:persistent="true" />
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="udfps_success_vib"
+            android:title="@string/udfps_success_vib_title"
+            android:summary="@string/udfps_success_vib_summary"
+            android:defaultValue="true" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="fingerprint_error_vib"
-        android:title="@string/fprint_error_vib_title"
-        android:summary="@string/fprint_error_vib_summary"
-        android:persistent="true" />
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="udfps_error_vib"
+            android:title="@string/udfps_error_vib_title"
+            android:summary="@string/udfps_error_vib_summary"
+            android:defaultValue="true" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="screen_off_fod"
-        android:title="@string/screen_off_fod_title"
-        android:summary="@string/screen_off_fod_summary"
-        android:defaultValue="true" />
 
     <PreferenceCategory
         android:key="udfps_customization"
-        android:title="UDFPS Customization">
-    
+        android:title="@string/udfps_customization">
+
+        <Preference
+            android:key="udfps_icon_picker"
+            android:title="@string/udfps_icon_picker_title"
+            android:summary="@string/udfps_icon_picker_summary"
+            android:fragment="com.cherish.settings.fragments.UdfpsIconPicker" />
+
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="custom_fp_icon_enabled"
             android:title="@string/custom_fp_icon_title"
@@ -54,21 +48,21 @@
             android:title="@string/custom_fp_select_title"
             android:summary="@string/custom_fp_select_summary"
             android:dependency="custom_fp_icon_enabled"
-            android:persistent="false" >
+            android:persistent="false">
         </Preference>
 
-        <Preference
-            android:key="udfps_icon_picker"
-            android:title="@string/udfps_icon_picker_title"
-            android:summary="@string/udfps_icon_picker_summary"
-            android:fragment="com.cherish.settings.fragments.UdfpsIconPicker" />
-
         <Preference
             android:key="udfps_recognizing_animation_preview"
             android:title="@string/udfps_recog_animation_effect_title"
             android:summary="@string/udfps_recog_animation_effect_summary"
-            android:fragment="com.cherish.settings.fragments.UdfpsAnimation"/>
-    
+            android:fragment="com.cherish.settings.fragments.UdfpsAnimation" />
+
+        <Preference
+            android:key="udfps_pressedicon_picker"
+            android:title="@string/udfps_pressed_color_title"
+            android:summary="@string/udfps_pressed_color_summary"
+            android:fragment="com.cherish.settings.fragments.UdfpsPressedIconPicker" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/cherish_settings_volume.xml

@@ -15,6 +15,49 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/volume_steps_fragment_title">
+	
+	<ListPreference
+        android:key="volume_steps_alarm"
+        android:title="@string/volume_steps_alarm_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_dtmf"
+        android:title="@string/volume_steps_dtmf_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_music"
+        android:title="@string/volume_steps_music_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_notification"
+        android:title="@string/volume_steps_notification_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_ring"
+        android:title="@string/volume_steps_ring_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_system"
+        android:title="@string/volume_steps_system_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
+
+    <ListPreference
+        android:key="volume_steps_voice_call"
+        android:title="@string/volume_steps_voice_call_title"
+        android:entries="@array/volume_steps_entries"
+        android:entryValues="@array/volume_steps_entries" />
 
 </PreferenceScreen>

res/xml/cherish_settings_volume_steps.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Pure Nexus 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/volume_steps_fragment_title">
-
-    <ListPreference
-        android:key="volume_steps_alarm"
-        android:title="@string/volume_steps_alarm_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_dtmf"
-        android:title="@string/volume_steps_dtmf_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_music"
-        android:title="@string/volume_steps_music_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_notification"
-        android:title="@string/volume_steps_notification_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_ring"
-        android:title="@string/volume_steps_ring_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_system"
-        android:title="@string/volume_steps_system_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-    <ListPreference
-        android:key="volume_steps_voice_call"
-        android:title="@string/volume_steps_voice_call_title"
-        android:entries="@array/volume_steps_entries"
-        android:entryValues="@array/volume_steps_entries" />
-
-</PreferenceScreen>

res/xml/edge_lightning_settings.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 Yet Another AOSP 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/pulse_ambient_light_title"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="ambient_notification_light_enabled"
-        android:title="@string/ambient_notification_light_enabled_title"
-        android:summary="@string/ambient_notification_light_enabled_summary"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="ambient_light_pulse_for_all"
-        android:title="@string/pulse_ambient_light_show_always_title"
-        android:summary="@string/pulse_ambient_light_show_always_summary"
-        android:defaultValue="false" />
-			
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="ambient_notification_light_hide_aod"
-        android:title="@string/ambient_notification_light_hide_aod_title"
-        android:summary="@string/ambient_notification_light_hide_aod_summary"
-        android:defaultValue="false"
-        android:dependency="ambient_notification_light_enabled" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="ambient_notification_light_duration"
-        android:title="@string/ambient_notification_light_duration_title"
-        android:summary="@string/ambient_notification_light_duration_summary"
-        android:max="5"
-        settings:min="1"
-        settings:defaultValue="2"
-        settings:units="@string/unit_seconds" />
-
-    <com.cherish.settings.preferences.CustomSeekBarPreference
-        android:key="ambient_notification_light_repeats"
-        android:title="@string/ambient_notification_light_repeats_title"
-        android:summary="@string/ambient_notification_light_repeats_summary"
-        android:max="10"
-        settings:min="0"
-        settings:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="ambient_notification_light_timeout"
-        android:title="@string/ambient_notification_light_timeout_title"
-        android:entries="@array/ambient_notification_light_timeout_entries"
-        android:entryValues="@array/ambient_notification_light_timeout_values"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="ambient_notification_color_mode"
-        android:title="@string/ambient_notification_color_mode_title"
-        android:entries="@array/ambient_notification_color_mode_entries"
-        android:entryValues="@array/ambient_notification_color_mode_values"
-        android:defaultValue="0" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="ambient_notification_light_color"
-        android:title="@string/ambient_notification_light_color_title" />
-		
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="ambient_light_repeat_direction"
-        android:title="@string/pulse_ambient_light_repeat_direction_title"
-        android:entries="@array/pulse_ambient_light_repeat_direction_entries"
-        android:entryValues="@array/pulse_ambient_light_repeat_direction_values"
-        android:summary="%s"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="ambient_light_layout"
-        android:title="@string/pulse_ambient_light_layout_title"
-        android:entries="@array/pulse_ambient_light_layout_entries"
-        android:entryValues="@array/pulse_ambient_light_layout_values"
-        android:summary="%s"
-        android:defaultValue="1" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="pulse_light_layout_style"
-        android:title="@string/pulse_light_layout_style_title"
-        android:entries="@array/pulse_light_layout_style_entries"
-        android:entryValues="@array/pulse_light_layout_style_values"
-        android:summary="%s"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
-        android:key="pulse_ambient_light_width"
-        android:title="@string/pulse_ambient_light_width_title"
-        android:max="150"
-        android:min="1"
-        settings:unitsLeft=""
-        settings:unitsRight="px"
-        android:defaultValue="125" />
-			
-</PreferenceScreen>

res/xml/heads_up_settings.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">
-
-    <com.cherish.settings.preferences.GlobalSettingSwitchPreference
-            android:key="heads_up_notifications_enabled"
-            android:title="@string/heads_up_notifications"
-            android:summaryOn="@string/summary_heads_up_enabled"
-            android:summaryOff="@string/summary_heads_up_disabled"
-            android:defaultValue="true" />
-
-    <ListPreference
-        android:key="heads_up_time_out"
-        android:title="@string/heads_up_time_out_title"
-        android:entries="@array/heads_up_time_out_entries"
-        android:entryValues="@array/heads_up_time_out_values"
-        android:persistent="false" />
-
-    <ListPreference
-        android:key="heads_up_snooze_time"
-        android:title="@string/heads_up_snooze_title"
-        android:entries="@array/heads_up_snooze_entries"
-        android:entryValues="@array/heads_up_snooze_values"
-        android:persistent="false" />
-
-    <PreferenceCategory
-            android:title="@string/heads_up_stoplist_title"
-            android:key="stoplist_applications"
-            android:dependency="heads_up_notifications_enabled" >
-        <Preference
-            android:key="add_stoplist_packages"
-            android:icon="@drawable/ic_menu_add_activated_tint"
-            android:title="@string/add_heads_up_package"
-            android:summary="@string/add_heads_up_stoplist_summary" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/heads_up_blacklist_title"
-            android:key="blacklist_applications"
-            android:dependency="heads_up_notifications_enabled" >
-        <Preference
-            android:key="add_blacklist_packages"
-            android:icon="@drawable/ic_menu_add_activated_tint"
-            android:title="@string/add_heads_up_package"
-            android:summary="@string/add_heads_up_blacklist_summary" />
-    </PreferenceCategory>
-
-</PreferenceScreen>

res/xml/omnijaws_settings.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2017 The OmniROM Project
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="omnijaws_settings"
+    android:title="@string/weather_title">
+
+     <ListPreference
+            android:key="weather_icon_pack"
+            android:title="@string/weather_icon_pack_title"
+            android:persistent="false" />
+
+     <com.android.settingslib.widget.FooterPreference
+            android:title="@string/weather_icon_pack_info_title" />
+
+      <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="kg_show_weather_temp"
+        android:title="@string/kg_weather_title"
+        android:dialogTitle="@string/kg_weather_title"
+        android:entries="@array/kg_launcher_weather_entries"
+        android:summary="%s"
+        android:entryValues="@array/kg_launcher_weather_values" />
+
+      <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="qs_show_weather_temp"
+        android:title="@string/qs_weather_title"
+        android:dialogTitle="@string/qs_weather_title"
+        android:entries="@array/qs_weather_entries"
+        android:summary="%s"
+        android:entryValues="@array/qs_weather_values" />
+
+      <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="qs_weather_position"
+        android:title="@string/qsweather_dialog_title"
+        android:dialogTitle="@string/qsweather_dialog_title"
+        android:entries="@array/qsweather_position_entries"
+        android:summary="%s"
+        android:entryValues="@array/qsweather_position_values" />
+
+    <Preference
+        android:title="@string/weather_config_title"
+        android:summary="@string/weather_config_summary">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="org.omnirom.omnijaws"
+            android:targetClass="org.omnirom.omnijaws.SettingsActivityService" />
+    </Preference>
+
+</PreferenceScreen>

res/xml/pulse_settings.xml

@@ -42,6 +42,26 @@
         android:entryValues="@array/pulse_render_mode_values"
         android:defaultValue="1"/>
 
+    <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="pulse_custom_gravity"
+        android:title="@string/pulse_custom_gravity_title"
+        android:entries="@array/pulse_custom_gravity_entries"
+        android:entryValues="@array/pulse_custom_gravity_values"
+        android:summary="%s"
+        android:defaultValue="0"/>
+
+    <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        android:key="visualizer_center_mirrored"
+        android:title="@string/visualizer_center_mirrored_title"
+        android:summary="@string/visualizer_center_mirrored_summary"
+        android:defaultValue="false"/>
+
+    <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        android:key="pulse_vertical_mirror"
+        android:title="@string/pulse_vertical_mirror_title"
+        android:summary="@string/pulse_vertical_mirror_summary"
+        android:defaultValue="false"/>
+
     <com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="pulse_smoothing_enabled"
         android:title="@string/pulse_smoothing_enabled_title"

res/xml/smart_charging.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020-2022 The CherishOS 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"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/smart_charging_title">
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="smart_charging"
+        android:title="@string/smart_charging_switch_title"
+        android:summary="@string/smart_charging_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="smart_charging_reset_stats"
+        android:title="@string/smart_charging_reset_stats_title"
+        android:summary="@string/smart_charging_reset_stats_summary"
+        android:defaultValue="false"
+        android:dependency="smart_charging" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="smart_charging_level"
+        android:title="@string/smart_charging_level_title"
+        android:max="100"
+        settings:min="65"
+        settings:units="%"
+        android:defaultValue="80"
+        android:dependency="smart_charging" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="smart_charging_resume_level"
+        android:title="@string/smart_charging_resume_level_title"
+        android:max="99"
+        settings:min="15"
+        settings:units="%"
+        android:defaultValue="60"
+        android:dependency="smart_charging" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="smart_charging_footer"
+        android:selectable="false"
+        settings:searchable="false"
+        android:dependency="smart_charging" />
+</PreferenceScreen>

res/xml/statusbar_battery.xml

@@ -1,41 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 Nitrogen Project
-
+<!-- Copyright (C) 2017-2019 The Dirty Unicorns 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/battery_style_category_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="battery_level_colors"
-            android:title="@string/battery_level_colors_title"
-            android:summary="@string/battery_level_colors_summary"
-            android:defaultValue="false" />
 
-    <ListPreference
-        android:key="status_bar_battery_style"
-        android:dialogTitle="@string/status_bar_battery_style_title"
-        android:title="@string/status_bar_battery_style_title"
-        android:entries="@array/entries_status_bar_battery"
-        android:entryValues="@array/values_status_bar_battery" />
+    <!-- Status bar battery customizations -->
+    <PreferenceCategory
+        android:title="@string/status_bar_battery_category_title">
 
-    <ListPreference
-        android:key="status_bar_show_battery_percent"
-        android:title="@string/status_bar_battery_percentage_title"
-        android:dialogTitle="@string/status_bar_battery_percentage_title"
-        android:entries="@array/status_bar_battery_percentage_entries"
-        android:entryValues="@array/status_bar_battery_percentage_values" />
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="status_bar_battery_style"
+            android:title="@string/status_bar_battery_style_title"
+            android:summary="%s"
+            android:dialogTitle="@string/status_bar_battery_style_title"
+            android:entries="@array/status_bar_battery_style_entries"
+            android:entryValues="@array/status_bar_battery_style_values"
+            android:defaultValue="0" />
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="status_bar_show_battery_percent"
+            android:title="@string/status_bar_battery_percent_title"
+            android:dialogTitle="@string/status_bar_battery_percent_title"
+            android:entries="@array/status_bar_battery_percent_entries"
+            android:entryValues="@array/status_bar_battery_percent_values"
+            android:defaultValue="0" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="status_bar_battery_text_charging"
+            android:title="@string/status_bar_battery_text_charging_title"
+            android:summary="@string/status_bar_battery_text_charging_summary"
+            android:defaultValue="true" />
+
+    </PreferenceCategory>
+
+    <!-- QS panel battery customizations -->
+    <PreferenceCategory
+        android:title="@string/qs_battery_category_title">
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="qs_battery_style"
+            android:title="@string/status_bar_battery_style_title"
+            android:entries="@array/qs_battery_style_entries"
+            android:entryValues="@array/qs_battery_style_values"
+            android:defaultValue="-1" />
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="qs_show_battery_percent"
+            android:title="@string/qs_battery_percent_title"
+            android:entries="@array/status_bar_battery_percent_entries"
+            android:entryValues="@array/status_bar_battery_percent_values"
+            android:defaultValue="2" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>

src/com/cherish/settings/CherishTogglePreferenceController.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 FlamingoOS 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.
+ */
+
+package com.cherish.settings
+
+import android.content.Context
+import android.widget.Switch
+
+import androidx.preference.Preference
+import androidx.preference.PreferenceScreen
+
+import com.android.settings.R
+import com.android.settings.core.TogglePreferenceController
+import com.android.settingslib.widget.MainSwitchPreference
+import com.android.settingslib.widget.OnMainSwitchChangeListener
+
+abstract class CherishTogglePreferenceController(
+    context: Context,
+    key: String,
+) : TogglePreferenceController(context, key),
+    OnMainSwitchChangeListener {
+
+    override fun displayPreference(screen: PreferenceScreen) {
+        super.displayPreference(screen)
+        val preference = screen.findPreference<Preference>(preferenceKey) ?: return
+        if (preference is MainSwitchPreference) {
+            preference.addOnSwitchChangeListener(this)
+        }
+    }
+
+    override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
+        setChecked(isChecked)
+    }
+
+    override fun getSliceHighlightMenuRes() = R.string.menu_key_cherish
+}

src/com/cherish/settings/fragments/AnimationsSettings.java

@@ -55,13 +55,9 @@ import java.util.List;
 public class AnimationsSettings extends SettingsPreferenceFragment
             implements OnPreferenceChangeListener {
 				
-	private static final String PREF_TILE_ANIM_STYLE = "qs_tile_animation_style";
-    private static final String PREF_TILE_ANIM_DURATION = "qs_tile_animation_duration";
-    private static final String PREF_TILE_ANIM_INTERPOLATOR = "qs_tile_animation_interpolator";
+	private static final String POWER_MENU_ANIMATIONS = "power_menu_animations";
 
-    private ListPreference mTileAnimationStyle;
-    private ListPreference mTileAnimationDuration;
-    private ListPreference mTileAnimationInterpolator;
+    private ListPreference mPowerMenuAnimations;
 
     @Override
     public int getMetricsCategory() {
@@ -74,29 +70,12 @@ public class AnimationsSettings extends SettingsPreferenceFragment
         addPreferencesFromResource(R.xml.cherish_settings_animations);
         ContentResolver resolver = getActivity().getContentResolver();
         PreferenceScreen prefs = getPreferenceScreen();
-		
-		// QS animation
-        mTileAnimationStyle = (ListPreference) findPreference(PREF_TILE_ANIM_STYLE);
-        int tileAnimationStyle = Settings.System.getIntForUser(resolver,
-                Settings.System.ANIM_TILE_STYLE, 0, UserHandle.USER_CURRENT);
-        mTileAnimationStyle.setValue(String.valueOf(tileAnimationStyle));
-        updateTileAnimationStyleSummary(tileAnimationStyle);
-        updateAnimTileStyle(tileAnimationStyle);
-        mTileAnimationStyle.setOnPreferenceChangeListener(this);
 
-         mTileAnimationDuration = (ListPreference) findPreference(PREF_TILE_ANIM_DURATION);
-        int tileAnimationDuration = Settings.System.getIntForUser(resolver,
-                Settings.System.ANIM_TILE_DURATION, 2000, UserHandle.USER_CURRENT);
-        mTileAnimationDuration.setValue(String.valueOf(tileAnimationDuration));
-        updateTileAnimationDurationSummary(tileAnimationDuration);
-        mTileAnimationDuration.setOnPreferenceChangeListener(this);
-
-        mTileAnimationInterpolator = (ListPreference) findPreference(PREF_TILE_ANIM_INTERPOLATOR);
-        int tileAnimationInterpolator = Settings.System.getIntForUser(getContentResolver(),
-                Settings.System.ANIM_TILE_INTERPOLATOR, 0, UserHandle.USER_CURRENT);
-        mTileAnimationInterpolator.setValue(String.valueOf(tileAnimationInterpolator));
-        updateTileAnimationInterpolatorSummary(tileAnimationInterpolator);
-        mTileAnimationInterpolator.setOnPreferenceChangeListener(this);
+        mPowerMenuAnimations = (ListPreference) findPreference(POWER_MENU_ANIMATIONS);
+        mPowerMenuAnimations.setValue(String.valueOf(Settings.System.getInt(
+                getContentResolver(), Settings.System.POWER_MENU_ANIMATIONS, 0)));
+        mPowerMenuAnimations.setSummary(mPowerMenuAnimations.getEntry());
+        mPowerMenuAnimations.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -106,59 +85,17 @@ public class AnimationsSettings extends SettingsPreferenceFragment
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mTileAnimationStyle) {
-            int tileAnimationStyle = Integer.valueOf((String) newValue);
-            Settings.System.putIntForUser(resolver, Settings.System.ANIM_TILE_STYLE,
-                    tileAnimationStyle, UserHandle.USER_CURRENT);
-            updateTileAnimationStyleSummary(tileAnimationStyle);
-            updateAnimTileStyle(tileAnimationStyle);
-            return true;
-       } else if (preference == mTileAnimationDuration) {
-            int tileAnimationDuration = Integer.valueOf((String) newValue);
-            Settings.System.putIntForUser(resolver, Settings.System.ANIM_TILE_DURATION,
-                    tileAnimationDuration, UserHandle.USER_CURRENT);
-            updateTileAnimationDurationSummary(tileAnimationDuration);
-            return true;
-       } else if (preference == mTileAnimationInterpolator) {
-            int tileAnimationInterpolator = Integer.valueOf((String) newValue);
-            Settings.System.putIntForUser(resolver, Settings.System.ANIM_TILE_INTERPOLATOR,
-                    tileAnimationInterpolator, UserHandle.USER_CURRENT);
-            updateTileAnimationInterpolatorSummary(tileAnimationInterpolator);
+		ContentResolver resolver = getActivity().getContentResolver();
+        if (preference == mPowerMenuAnimations) {
+            Settings.System.putInt(getContentResolver(), Settings.System.POWER_MENU_ANIMATIONS,
+                    Integer.valueOf((String) newValue));
+            mPowerMenuAnimations.setValue(String.valueOf(newValue));
+            mPowerMenuAnimations.setSummary(mPowerMenuAnimations.getEntry());
             return true;
         }
-        return false;
-    }
-	
-	private void updateTileAnimationStyleSummary(int tileAnimationStyle) {
-        String prefix = (String) mTileAnimationStyle.getEntries()[mTileAnimationStyle.findIndexOfValue(String
-                .valueOf(tileAnimationStyle))];
-        mTileAnimationStyle.setSummary(getResources().getString(R.string.qs_set_animation_style, prefix));
-    }
+	return false;
+}
 
-     private void updateTileAnimationDurationSummary(int tileAnimationDuration) {
-        String prefix = (String) mTileAnimationDuration.getEntries()[mTileAnimationDuration.findIndexOfValue(String
-                .valueOf(tileAnimationDuration))];
-        mTileAnimationDuration.setSummary(getResources().getString(R.string.qs_set_animation_duration, prefix));
-    }
-
-    private void updateTileAnimationInterpolatorSummary(int tileAnimationInterpolator) {
-        String prefix = (String) mTileAnimationInterpolator.getEntries()[mTileAnimationInterpolator.findIndexOfValue(String
-                .valueOf(tileAnimationInterpolator))];
-        mTileAnimationInterpolator.setSummary(getResources().getString(R.string.qs_set_animation_interpolator, prefix));
-    }
-
-    private void updateAnimTileStyle(int tileAnimationStyle) {
-        if (mTileAnimationDuration != null) {
-            if (tileAnimationStyle == 0) {
-                mTileAnimationDuration.setSelectable(false);
-                mTileAnimationInterpolator.setSelectable(false);
-            } else {
-                mTileAnimationDuration.setSelectable(true);
-                mTileAnimationInterpolator.setSelectable(true);
-            }
-        }
-	}
 /**
      * For Search.
      */

src/com/cherish/settings/fragments/AppListFragment.kt

@@ -16,7 +16,7 @@
 
 package com.cherish.settings.fragment
 
-import android.content.Context
+import android.annotation.IntDef
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
@@ -35,6 +35,7 @@ import android.widget.TextView
 
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
@@ -43,8 +44,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.android.settings.R
 import com.google.android.material.appbar.AppBarLayout
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
@@ -57,38 +56,29 @@ import kotlinx.coroutines.withContext
  * and package name of the application, along with a [CheckBox]
  * indicating whether the item is selected or not.
  */
-abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnActionExpandListener {
+abstract class AppListFragment : Fragment(R.layout.app_list_layout),
+    MenuItem.OnActionExpandListener {
 
     private val mutex = Mutex()
 
-    private lateinit var fragmentScope: CoroutineScope
-    private lateinit var progressBar: ProgressBar
-    private lateinit var appBarLayout: AppBarLayout
-    private lateinit var packageManager: PackageManager
-    private lateinit var recyclerView: RecyclerView
+    private lateinit var pm: PackageManager
     private lateinit var adapter: AppListAdapter
 
-    private val packageList = mutableListOf<PackageInfo>()
+    private var appBarLayout: AppBarLayout? = null
+    private var recyclerView: RecyclerView? = null
+    private var progressBar: ProgressBar? = null
 
     private var searchText = ""
     private var displayCategory: Int = CATEGORY_USER_ONLY
-    private var packageFilter: ((PackageInfo) -> Boolean) = { true }
-    private var packageComparator: ((PackageInfo, PackageInfo) -> Int) = { a, b ->
-        getLabel(a).compareTo(getLabel(b))
-    }
-
-    private var needsToHideProgressBar = false
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        fragmentScope = CoroutineScope(Dispatchers.Main)
+    private var packageFilter: (PackageInfo) -> Boolean = { true }
+    private var packageComparator: (PackageInfo, PackageInfo) -> Int = { first, second ->
+        getLabel(first).compareTo(getLabel(second))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        packageManager = requireContext().packageManager
-        packageList.addAll(packageManager.getInstalledPackages(0))
+        pm = requireContext().packageManager
     }
 
     /**
@@ -97,15 +87,19 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
     abstract protected fun getTitle(): Int
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        requireActivity().setTitle(getTitle())
-        appBarLayout = requireActivity().findViewById(R.id.app_bar)
+        val activity = requireActivity()
+        activity.setTitle(getTitle())
+        appBarLayout = activity.findViewById(R.id.app_bar)
         progressBar = view.findViewById(R.id.loading_progress)
-        adapter = AppListAdapter()
-        recyclerView = view.findViewById<RecyclerView>(R.id.apps_list).also {
+        adapter = AppListAdapter(getInitialCheckedList(), layoutInflater).apply {
+            setOnAppSelectListener { onAppSelected(it) }
+            setOnAppDeselectListener { onAppDeselected(it) }
+            setOnListUpdateListener { onListUpdate(it) }
+        }
+        recyclerView = view.findViewById<RecyclerView>(R.id.apps_list)?.also {
             it.layoutManager = LinearLayoutManager(context)
             it.adapter = adapter
         }
-        needsToHideProgressBar = true
         refreshList()
     }
 
@@ -118,19 +112,21 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.app_list_menu, menu)
         val searchItem = menu.findItem(R.id.search).also {
-            it.setOnActionExpandListener(this)
+            if (appBarLayout != null) {
+                it.setOnActionExpandListener(this)
+            }
         }
         val searchView = searchItem.actionView as SearchView
-        searchView.setQueryHint(getString(R.string.search_apps));
-        searchView.setOnQueryTextListener(object: SearchView.OnQueryTextListener {
+        searchView.setQueryHint(getString(R.string.search_apps))
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String) = false
 
             override fun onQueryTextChange(newText: String): Boolean {
-                fragmentScope.launch {
+                lifecycleScope.launch {
                     mutex.withLock {
                         searchText = newText
                     }
-                    refreshList()
+                    refreshListInternal()
                 }
                 return true
             }
@@ -139,34 +135,29 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
 
     override fun onMenuItemActionExpand(item: MenuItem): Boolean {
         // To prevent a large space on tool bar.
-        appBarLayout.setExpanded(false /*expanded*/, false /*animate*/)
+        appBarLayout?.setExpanded(false /*expanded*/, false /*animate*/)
         // To prevent user expanding the collapsing tool bar view.
-        ViewCompat.setNestedScrollingEnabled(recyclerView, false)
+        recyclerView?.let { ViewCompat.setNestedScrollingEnabled(it, false) }
         return true
     }
 
     override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
         // We keep the collapsed status after user cancel the search function.
-        appBarLayout.setExpanded(false /*expanded*/, false /*animate*/)
+        appBarLayout?.setExpanded(false /*expanded*/, false /*animate*/)
         // Allow user to expande the tool bar view.
-        ViewCompat.setNestedScrollingEnabled(recyclerView, true)
+        recyclerView?.let { ViewCompat.setNestedScrollingEnabled(it, true) }
         return true
     }
 
-    override fun onDetach() {
-        fragmentScope.cancel()
-        super.onDetach()
-    }
-
     /**
      * Set the type of apps that should be displayed in the list.
      * Defaults to [CATEGORY_USER_ONLY].
      *
      * @param category one of [CATEGORY_SYSTEM_ONLY],
-     * [CATEGORY_USER_ONLY], [CATEGORY_BOTH]
+     *      [CATEGORY_USER_ONLY], [CATEGORY_BOTH]
      */
-    fun setDisplayCategory(category: Int) {
-        fragmentScope.launch {
+    fun setDisplayCategory(@Category category: Int) {
+        lifecycleScope.launch {
             mutex.withLock {
                 displayCategory = category
             }
@@ -177,10 +168,10 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
      * Set a custom filter to filter out items from the list.
      *
      * @param customFilter a function that takes a [PackageInfo] and
-     * returns a [Boolean] indicating whether to show the item or not. 
+     *      returns a [Boolean] indicating whether to show the item or not.
      */
-    fun setCustomFilter(customFilter: ((packageInfo: PackageInfo) -> Boolean)) {
-        fragmentScope.launch {
+    fun setCustomFilter(customFilter: (PackageInfo) -> Boolean) {
+        lifecycleScope.launch {
             mutex.withLock {
                 packageFilter = customFilter
             }
@@ -188,13 +179,13 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
     }
 
     /**
-     * Set a [Comparator] for sorting the elements in the list..
+     * Set a [Comparator] for sorting the elements in the list.
      *
      * @param comparator a function that takes two [PackageInfo]'s and returns
-     * an [Int] representing their relative priority.
+     *      an [Int] representing their relative priority.
      */
-    fun setComparator(comparator: ((a: PackageInfo, b: PackageInfo) -> Int)) {
-        fragmentScope.launch {
+    fun setComparator(comparator: (PackageInfo, PackageInfo) -> Int) {
+        lifecycleScope.launch {
             mutex.withLock {
                 packageComparator = comparator
             }
@@ -222,75 +213,111 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
      */
     open protected fun onAppDeselected(packageName: String) {}
 
-    protected fun refreshList() {
-        fragmentScope.launch {
-            val list = withContext(Dispatchers.Default) {
-                mutex.withLock {
-                    packageList.filter {
-                        when (displayCategory) {
-                            CATEGORY_SYSTEM_ONLY -> it.applicationInfo.isSystemApp()
-                            CATEGORY_USER_ONLY -> !it.applicationInfo.isSystemApp()
-                            else -> true
-                        } &&
-                        getLabel(it).contains(searchText, true) &&
-                        packageFilter(it)
-                    }.sortedWith(packageComparator).map { appInfofromPackage(it) }
-                }
-            }
-            adapter.submitList(list)
-            if (needsToHideProgressBar) {
-                progressBar.visibility = View.GONE
-                needsToHideProgressBar = false
-            }
+    fun refreshList() {
+        lifecycleScope.launch {
+            refreshListInternal()
         }
     }
 
-    private fun appInfofromPackage(packageInfo: PackageInfo): AppInfo =
-        AppInfo(
-            packageInfo.packageName,
-            getLabel(packageInfo),
-            packageInfo.applicationInfo.loadIcon(packageManager),
-        )
+    private suspend fun refreshListInternal() {
+        val list = withContext(Dispatchers.Default) {
+            val sortedList = mutex.withLock {
+                pm.getInstalledPackages(PackageManager.MATCH_ALL).filter {
+                    val categoryMatches = when (displayCategory) {
+                        CATEGORY_SYSTEM_ONLY -> it.applicationInfo.isSystemApp()
+                        CATEGORY_USER_ONLY -> !it.applicationInfo.isSystemApp()
+                        else -> true
+                    }
+                    categoryMatches && packageFilter(it) &&
+                        getLabel(it).contains(searchText, true)
+                }.sortedWith(packageComparator)
+            }
+            sortedList.map {
+                AppInfo(
+                    it.packageName,
+                    getLabel(it),
+                    it.applicationInfo.loadIcon(pm),
+                )
+            }
+        }
+        adapter.submitList(list)
+        progressBar?.visibility = View.GONE
+    }
 
     private fun getLabel(packageInfo: PackageInfo) =
-        packageInfo.applicationInfo.loadLabel(packageManager).toString()
+        packageInfo.applicationInfo.loadLabel(pm).toString()
 
-    private inner class AppListAdapter :
-            ListAdapter<AppInfo, AppListViewHolder>(itemCallback)
-    {
-        private val checkedList = getInitialCheckedList().toMutableList()
+    private class AppListAdapter(
+        initialCheckedList: List<String>,
+        private val layoutInflater: LayoutInflater
+    ) : ListAdapter<AppInfo, AppListViewHolder>(itemCallback) {
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-            AppListViewHolder(layoutInflater.inflate(
-                R.layout.app_list_item, parent, false))
+        private val checkedList = initialCheckedList.toMutableList()
+        private var appSelectListener: (String) -> Unit = {}
+        private var appDeselectListener: (String) -> Unit = {}
+        private var listUpdateListener: (List<String>) -> Unit = {}
+
+        override fun onCreateViewHolder(
+            parent: ViewGroup,
+            viewType: Int
+        ) = AppListViewHolder(
+                layoutInflater.inflate(
+                    R.layout.app_list_item,
+                    parent,
+                    false /* attachToParent */
+                )
+            )
 
         override fun onBindViewHolder(holder: AppListViewHolder, position: Int) {
             val item = getItem(position)
-            val pkg = item.packageName
-            holder.label.setText(item.label)
-            holder.packageName.setText(pkg)
+            holder.label.text = item.label
+            holder.packageName.text = item.packageName
             holder.icon.setImageDrawable(item.icon)
-            holder.checkBox.setChecked(checkedList.contains(pkg))
+            holder.checkBox.isChecked = checkedList.contains(item.packageName)
             holder.itemView.setOnClickListener {
-                if (checkedList.contains(pkg)){
-                    checkedList.remove(pkg)
-                    onAppDeselected(pkg)
+                if (checkedList.contains(item.packageName)) {
+                    checkedList.remove(item.packageName)
+                    appDeselectListener(item.packageName)
                 } else {
-                    checkedList.add(pkg)
-                    onAppSelected(pkg)
+                    checkedList.add(item.packageName)
+                    appSelectListener(item.packageName)
                 }
                 notifyItemChanged(position)
-                onListUpdate(checkedList.toList())
+                listUpdateListener(checkedList.toList())
+            }
+        }
+
+        fun setOnAppSelectListener(listener: (String) -> Unit) {
+            appSelectListener = listener
+        }
+
+        fun setOnAppDeselectListener(listener: (String) -> Unit) {
+            appDeselectListener = listener
+        }
+
+        fun setOnListUpdateListener(listener: (List<String>) -> Unit) {
+            listUpdateListener = listener
+        }
+
+        companion object {
+            private val itemCallback = object : DiffUtil.ItemCallback<AppInfo>() {
+                override fun areItemsTheSame(oldInfo: AppInfo, newInfo: AppInfo) =
+                    oldInfo.packageName == newInfo.packageName
+
+                override fun areContentsTheSame(oldInfo: AppInfo, newInfo: AppInfo) =
+                    oldInfo == newInfo
             }
         }
     }
 
-    private class AppListViewHolder(itemView: View) :
-            RecyclerView.ViewHolder(itemView) {
+    private class AppListViewHolder(
+        itemView: View
+    ) : RecyclerView.ViewHolder(itemView) {
+
         val icon: ImageView = itemView.findViewById(R.id.icon)
         val label: TextView = itemView.findViewById(R.id.label)
-        val packageName: TextView = itemView.findViewById(R.id.packageName)
-        val checkBox: CheckBox = itemView.findViewById(R.id.checkBox)
+        val packageName: TextView = itemView.findViewById(R.id.package_name)
+        val checkBox: CheckBox = itemView.findViewById(R.id.check_box)
     }
 
     private data class AppInfo(
@@ -300,18 +327,16 @@ abstract class AppListFragment: Fragment(R.layout.app_list_layout), MenuItem.OnA
     )
 
     companion object {
-        private const val TAG = "AppListFragment"
-
         const val CATEGORY_SYSTEM_ONLY = 0
         const val CATEGORY_USER_ONLY = 1
         const val CATEGORY_BOTH = 2
 
-        private val itemCallback = object : DiffUtil.ItemCallback<AppInfo>() {
-            override fun areItemsTheSame(oldInfo: AppInfo, newInfo: AppInfo) =
-                oldInfo.packageName == newInfo.packageName
-
-            override fun areContentsTheSame(oldInfo: AppInfo, newInfo: AppInfo) =
-                oldInfo == newInfo
-        }
+        @IntDef(value = intArrayOf(
+            CATEGORY_SYSTEM_ONLY,
+            CATEGORY_USER_ONLY,
+            CATEGORY_BOTH
+        ))
+        @Retention(AnnotationRetention.SOURCE)
+        annotation class Category
     }
 }

src/com/cherish/settings/fragments/ButtonSettings.java

@@ -18,58 +18,50 @@
 package com.cherish.settings.fragments;
 
 import android.content.ContentResolver;
-import android.content.res.Resources;
 import android.content.Context;
+import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.os.Vibrator;
-import android.os.RemoteException;
-import android.os.PowerManager;
-import android.os.ServiceManager;
-import androidx.preference.PreferenceCategory;
+import android.provider.Settings;
+import android.view.View;
+
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.SwitchPreference;
-import android.provider.Settings;
-import android.widget.Toast;
-import com.android.settings.R;
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
-import com.cherish.settings.preferences.SecureSettingSwitchPreference;
-import com.android.internal.custom.hardware.LineageHardwareManager;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.util.cherish.CherishUtils;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.Utils;
-import com.cherish.settings.preferences.CustomSeekBarPreference;
 
+import com.android.internal.lineage.hardware.LineageHardwareManager;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.cherish.CherishUtils;
 import com.android.internal.util.hwkeys.ActionConstants;
 import com.android.internal.util.hwkeys.ActionUtils;
-
-import com.cherish.settings.preferences.CustomSeekBarPreference;
-import com.cherish.settings.preferences.ActionFragment;
-
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
-import android.provider.SearchIndexableResource;
+
+import com.cherish.settings.preferences.ActionFragment;
+import com.cherish.settings.preferences.SecureSettingSwitchPreference;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ButtonSettings extends ActionFragment implements OnPreferenceChangeListener {
+public class ButtonSettings extends ActionFragment implements
+        Preference.OnPreferenceChangeListener {
 
     private static final String HWKEY_DISABLE = "hardware_keys_disable";
-    private static final String NAVBAR_VISIBILITY = "navbar_visibility";
-    private static final String KEY_LAYOUT_SETTINGS = "layout_settings";
-    private static final String KEY_NAVIGATION_BAR_ARROWS = "navigation_bar_menu_arrow_keys";
+	private static final String NAVBAR_VISIBILITY = "navbar_visibility";
+    private static final String KEY_NAVBAR_INVERSE = "navigation_bar_inverse";
+    private static final String KEY_NAVIGATION_COMPACT_LAYOUT = "navigation_bar_compact_layout";
+    private static final String KEY_SWAP_CAPACITIVE_KEYS = "swap_capacitive_keys";
 
     // category keys
     private static final String CATEGORY_HWKEY = "hardware_keys";
@@ -81,11 +73,7 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
     private static final String CATEGORY_VOLUME = "volume_keys";
     private static final String CATEGORY_POWER = "power_key";
 
-    private static final String KEY_BUTTON_MANUAL_BRIGHTNESS_NEW = "button_manual_brightness_new";
-    private static final String KEY_BUTTON_TIMEOUT = "button_timeout";
-    private static final String KEY_BUTON_BACKLIGHT_OPTIONS = "button_backlight_options_category";
-
-     // Masks for checking presence of hardware keys.
+    // Masks for checking presence of hardware keys.
     // Must match values in frameworks/base/core/res/res/values/config.xml
     public static final int KEY_MASK_HOME = 0x01;
     public static final int KEY_MASK_BACK = 0x02;
@@ -95,20 +83,16 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
     public static final int KEY_MASK_CAMERA = 0x20;
     public static final int KEY_MASK_VOLUME = 0x40;
 
-    private static final String TORCH_POWER_BUTTON_GESTURE = "torch_power_button_gesture";
-
-    private SwitchPreference mHwKeyDisable;
-    private ListPreference mTorchPowerButton;
-    private CustomSeekBarPreference mButtonTimoutBar;
-    private CustomSeekBarPreference mManualButtonBrightness;
     private PreferenceCategory mButtonBackLightCategory;
+    private PreferenceCategory mHwKeyCategory;
+    private SecureSettingSwitchPreference mSwapCapacitiveKeys;
+    private SwitchPreference mHwKeyDisable;
 	private SwitchPreference mNavbarVisibility;
-	private Preference mLayoutSettings;
-    private SystemSettingSwitchPreference mNavigationArrows;
+    private SystemSettingSwitchPreference mNavbarInverse;
+    private SystemSettingSwitchPreference mNavigationCompactLayout;
 	
 	private boolean mIsNavSwitchingMode = false;
-
-    private Handler mHandler;
+	private Handler mHandler;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -119,8 +103,14 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
         final ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
 
+        mSwapCapacitiveKeys = findPreference(KEY_SWAP_CAPACITIVE_KEYS);
+        if (mSwapCapacitiveKeys != null && !isKeySwapperSupported(getActivity())) {
+            prefScreen.removePreference(mSwapCapacitiveKeys);
+            mSwapCapacitiveKeys = null;
+        }
+
         final boolean needsNavbar = ActionUtils.hasNavbarByDefault(getActivity());
-        final PreferenceCategory hwkeyCat = (PreferenceCategory) prefScreen
+        mHwKeyCategory = (PreferenceCategory) prefScreen
                 .findPreference(CATEGORY_HWKEY);
         int keysDisabled = 0;
         if (!needsNavbar) {
@@ -131,19 +121,19 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
             mHwKeyDisable.setChecked(keysDisabled != 0);
             mHwKeyDisable.setOnPreferenceChangeListener(this);
         } else {
-            prefScreen.removePreference(hwkeyCat);
+            prefScreen.removePreference(mHwKeyCategory);
         }
 
-         // bits for hardware keys present on device
+        // bits for hardware keys present on device
         final int deviceKeys = getResources().getInteger(
                 com.android.internal.R.integer.config_deviceHardwareKeys);
-         // read bits for present hardware keys
+        // read bits for present hardware keys
         final boolean hasHomeKey = (deviceKeys & KEY_MASK_HOME) != 0;
         final boolean hasBackKey = (deviceKeys & KEY_MASK_BACK) != 0;
         final boolean hasMenuKey = (deviceKeys & KEY_MASK_MENU) != 0;
         final boolean hasAssistKey = (deviceKeys & KEY_MASK_ASSIST) != 0;
         final boolean hasAppSwitchKey = (deviceKeys & KEY_MASK_APP_SWITCH) != 0;
-         // load categories and init/remove preferences based on device
+        // load categories and init/remove preferences based on device
         // configuration
         final PreferenceCategory backCategory = (PreferenceCategory) prefScreen
                 .findPreference(CATEGORY_BACK);
@@ -155,107 +145,67 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
                 .findPreference(CATEGORY_ASSIST);
         final PreferenceCategory appSwitchCategory = (PreferenceCategory) prefScreen
                 .findPreference(CATEGORY_APPSWITCH);
-         // back key
+        // back key
         if (!hasBackKey) {
             prefScreen.removePreference(backCategory);
         }
-         // home key
+        // home key
         if (!hasHomeKey) {
             prefScreen.removePreference(homeCategory);
         }
-         // App switch key (recents)
+        // App switch key (recents)
         if (!hasAppSwitchKey) {
             prefScreen.removePreference(appSwitchCategory);
         }
-         // menu key
+        // menu key
         if (!hasMenuKey) {
             prefScreen.removePreference(menuCategory);
         }
-         // search/assist key
+        // search/assist key
         if (!hasAssistKey) {
             prefScreen.removePreference(assistCategory);
         }
-         // let super know we can load ActionPreferences
+        // let super know we can load ActionPreferences
         onPreferenceScreenLoaded(ActionConstants.getDefaults(ActionConstants.HWKEYS));
 
         // load preferences first
         setActionPreferencesEnabled(keysDisabled == 0);
 
-        // screen off torch
-        mTorchPowerButton = (ListPreference) findPreference(TORCH_POWER_BUTTON_GESTURE);
-        int mTorchPowerButtonValue = Settings.System.getInt(resolver,
-                Settings.System.TORCH_POWER_BUTTON_GESTURE, 0);
-        mTorchPowerButton.setValue(Integer.toString(mTorchPowerButtonValue));
-        mTorchPowerButton.setSummary(mTorchPowerButton.getEntry());
-        mTorchPowerButton.setOnPreferenceChangeListener(this);
-
-        mManualButtonBrightness = (CustomSeekBarPreference) findPreference(
-                KEY_BUTTON_MANUAL_BRIGHTNESS_NEW);
-        final int customButtonBrightness = getResources().getInteger(
-                com.android.internal.R.integer.config_button_brightness_default);
-        final int currentBrightness = Settings.System.getInt(resolver,
-                Settings.System.CUSTOM_BUTTON_BRIGHTNESS, customButtonBrightness);
-        PowerManager pm = (PowerManager)getActivity().getSystemService(Context.POWER_SERVICE);
-        mManualButtonBrightness.setMax(pm.getMaximumScreenBrightnessSetting());
-        mManualButtonBrightness.setValue(currentBrightness);
-        mManualButtonBrightness.setOnPreferenceChangeListener(this);
+        final boolean isThreeButtonNavbarEnabled = CherishUtils.isThemeEnabled("com.android.internal.systemui.navbar.threebutton");
+        mNavbarInverse = (SystemSettingSwitchPreference) findPreference(KEY_NAVBAR_INVERSE);
+        mNavbarInverse.setEnabled(isThreeButtonNavbarEnabled);
+        mNavigationCompactLayout = (SystemSettingSwitchPreference) findPreference(KEY_NAVIGATION_COMPACT_LAYOUT);
+        mNavigationCompactLayout.setEnabled(isThreeButtonNavbarEnabled);
 		
 		mNavbarVisibility = (SwitchPreference) findPreference(NAVBAR_VISIBILITY);
 
         boolean showing = Settings.System.getIntForUser(resolver,
                 Settings.System.FORCE_SHOW_NAVBAR,
-                CherishUtils.hasNavbarByDefault(getActivity()) ? 1 : 0, UserHandle.USER_CURRENT) != 0;
+                ActionUtils.hasNavbarByDefault(getActivity()) ? 1 : 0, UserHandle.USER_CURRENT) != 0;
         mNavbarVisibility.setChecked(showing);
         mNavbarVisibility.setOnPreferenceChangeListener(this);
-
-        mHandler = new Handler();
-
-        mButtonTimoutBar = (CustomSeekBarPreference) findPreference(KEY_BUTTON_TIMEOUT);
-        int currentTimeout = Settings.System.getInt(resolver,
-                Settings.System.BUTTON_BACKLIGHT_TIMEOUT, 0);
-        mButtonTimoutBar.setValue(currentTimeout);
-        mButtonTimoutBar.setOnPreferenceChangeListener(this);
-
-        final boolean enableBacklightOptions = getResources().getBoolean(
-                com.android.internal.R.bool.config_button_brightness_support);
-
-        mButtonBackLightCategory = (PreferenceCategory) findPreference(KEY_BUTON_BACKLIGHT_OPTIONS);
-
-        if (!enableBacklightOptions) {
-            prefScreen.removePreference(mButtonBackLightCategory);
-        }
-
-        mLayoutSettings = (Preference) findPreference(KEY_LAYOUT_SETTINGS);
-
-        mNavigationArrows = (SystemSettingSwitchPreference) findPreference(KEY_NAVIGATION_BAR_ARROWS);
     }
 
+    private static boolean isKeyDisablerSupported(Context context) {
+        final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
+        return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE);
+    }
+
+    private static boolean isKeySwapperSupported(Context context) {
+        final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
+        return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_SWAP);
+    }
+
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mTorchPowerButton) {
-            int mTorchPowerButtonValue = Integer.valueOf((String) newValue);
-            int index = mTorchPowerButton.findIndexOfValue((String) newValue);
-            mTorchPowerButton.setSummary(
-                    mTorchPowerButton.getEntries()[index]);
-            Settings.System.putInt(resolver, Settings.System.TORCH_POWER_BUTTON_GESTURE,
-                    mTorchPowerButtonValue);
-            return true;
-        } else if (preference == mHwKeyDisable) {
+        if (preference == mHwKeyDisable) {
             boolean value = (Boolean) newValue;
             Settings.System.putInt(getContentResolver(), Settings.System.HARDWARE_KEYS_DISABLE,
                     value ? 1 : 0);
-			return true;
-        } else if (preference == mButtonTimoutBar) {
-            int buttonTimeout = (Integer) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.BUTTON_BACKLIGHT_TIMEOUT, buttonTimeout);
-			return true;
-        } else if (preference == mManualButtonBrightness) {
-            int buttonBrightness = (Integer) newValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.CUSTOM_BUTTON_BRIGHTNESS, buttonBrightness);
+            setActionPreferencesEnabled(!value);
             return true;
-        } else if (preference == mNavbarVisibility) {
+		} else if (preference == mNavbarVisibility) {
             if (mIsNavSwitchingMode) {
                 return false;
             }
@@ -277,42 +227,32 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
+        return MetricsEvent.CHERISH_SETTINGS;
     }
-	
-	private static boolean isKeyDisablerSupported(Context context) {
-        final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
-        return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE);
-    }
-	
-	@Override
-    protected boolean usesExtendedActionsList() {
-        return true;
-    }
-	
-	/**
+
+    /**
      * For Search.
      */
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    ArrayList<SearchIndexableResource> result =
-                            new ArrayList<SearchIndexableResource>();
-                    SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.cherish_settings_button;
-                    result.add(sir);
-                    return result;
-                }
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_button) {
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
+
+                    LineageHardwareManager mLineageHardware = LineageHardwareManager.getInstance(context);
+
+                    if (!isKeyDisablerSupported(context)) {
+                        keys.add(HWKEY_DISABLE);
+                        keys.add(CATEGORY_HWKEY);
+                        keys.add(CATEGORY_BACK);
+                        keys.add(CATEGORY_HOME);
+                        keys.add(CATEGORY_MENU);
+                        keys.add(CATEGORY_ASSIST);
+                        keys.add(CATEGORY_APPSWITCH);
+                    }
+
                     return keys;
                 }
-    };
-
-}
+            };
+}

src/com/cherish/settings/fragments/CherishDashboardFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cherish.settings.fragment
+package com.cherish.settings.fragments
 
 import androidx.preference.Preference
 

src/com/cherish/settings/fragments/Clock.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 The CherishOS Project
+ * Copyright (C) 2019-2022 The CherishOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,26 +20,28 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.format.DateFormat;
+import android.view.View;
 import android.widget.EditText;
 
 import androidx.preference.ListPreference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.cherish.CherishUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
@@ -73,7 +75,6 @@ public class Clock extends SettingsPreferenceFragment implements
     private SystemSettingListPreference mClockDateStyle;
     private ListPreference mClockDateFormat;
 
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);

src/com/cherish/settings/fragments/EdgeLightSettings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The CherishOS Project
+ * Copyright (C) 2019-2022 The CherishOS Projects
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,50 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.cherish.settings.fragments;
 
-import android.app.ActivityManagerNative;
-import android.content.Context;
 import android.content.ContentResolver;
-import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.Context;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import androidx.preference.Preference;
+import android.provider.Settings;
+import android.view.View;
+
 import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.Preference.OnPreferenceChangeListener;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.WindowManagerGlobal;
-import android.view.IWindowManager;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import java.util.Locale;
-import android.text.TextUtils;
-import android.view.View;
+import androidx.preference.SwitchPreference;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.Utils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
 
-public class LockscreenShortcuts extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
+import java.util.ArrayList;
+import java.util.List;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class EdgeLightSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.cherish_lockscreen_shortcuts);
-
-        final ContentResolver resolver = getActivity().getContentResolver();
-        final PreferenceScreen prefSet = getPreferenceScreen();
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.cherish_settings_edge_light);
+    }
 
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        return false;
     }
 
     @Override
@@ -64,13 +63,9 @@ public class LockscreenShortcuts extends SettingsPreferenceFragment implements O
         return MetricsEvent.CHERISH_SETTINGS;
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
-        return false;
-    }
-}
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_edge_light);
+}

src/com/cherish/settings/fragments/EdgeLightningSettings.java

@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2020 Yet Another AOSP 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.
- */
-package com.cherish.settings.fragments;
-
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.UserHandle;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.util.TypedValue;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-import com.cherish.settings.preferences.CustomSeekBarPreference;
-import com.cherish.settings.preferences.SystemSettingListPreference;
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
-
-public class EdgeLightningSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
-
-    private static String KEY_DURATION = "ambient_notification_light_duration";
-    private static String KEY_REPEATS = "ambient_notification_light_repeats";
-    private static String KEY_TIMEOUT = "ambient_notification_light_timeout";
-    private static String KEY_COLOR_MODE = "ambient_notification_color_mode";
-    private static String KEY_COLOR = "ambient_notification_light_color";
-
-    private CustomSeekBarPreference mDurationPref;
-    private CustomSeekBarPreference mRepeatsPref;
-    private SystemSettingListPreference mTimeoutPref;
-    private SystemSettingListPreference mColorModePref;
-    private ColorPickerPreference mColorPref;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.edge_lightning_settings);
-        final ContentResolver resolver = getContentResolver();
-        final int accentColor = getAccentColor();
-
-        mDurationPref = (CustomSeekBarPreference) findPreference(KEY_DURATION);
-        int value = Settings.System.getIntForUser(resolver,
-                KEY_DURATION, 2, UserHandle.USER_CURRENT);
-        mDurationPref.setValue(value);
-        mDurationPref.setOnPreferenceChangeListener(this);
-
-        mRepeatsPref = (CustomSeekBarPreference) findPreference(KEY_REPEATS);
-        int repeats = Settings.System.getIntForUser(resolver,
-                KEY_REPEATS, 0, UserHandle.USER_CURRENT);
-        mRepeatsPref.setValue(repeats);
-        mRepeatsPref.setOnPreferenceChangeListener(this);
-
-        mTimeoutPref = (SystemSettingListPreference) findPreference(KEY_TIMEOUT);
-        value = Settings.System.getIntForUser(resolver,
-                KEY_TIMEOUT, accentColor, UserHandle.USER_CURRENT);
-        mTimeoutPref.setValue(Integer.toString(value));
-        mTimeoutPref.setSummary(mTimeoutPref.getEntry());
-        mTimeoutPref.setOnPreferenceChangeListener(this);
-        updateTimeoutEnablement(repeats);
-
-        mColorPref = (ColorPickerPreference) findPreference(KEY_COLOR);
-        value = Settings.System.getIntForUser(resolver,
-                KEY_COLOR, accentColor, UserHandle.USER_CURRENT);
-        mColorPref.setDefaultColor(accentColor);
-        String colorHex = String.format("#%08x", (0xFFFFFFFF & value));
-        if (value == accentColor) {
-            mColorPref.setSummary(R.string.default_string);
-        } else {
-            mColorPref.setSummary(colorHex);
-        }
-        mColorPref.setNewPreviewColor(value);
-        mColorPref.setOnPreferenceChangeListener(this);
-
-        mColorModePref = (SystemSettingListPreference) findPreference(KEY_COLOR_MODE);
-        value = Settings.System.getIntForUser(resolver,
-                KEY_COLOR_MODE, 0, UserHandle.USER_CURRENT);
-        mColorModePref.setValue(Integer.toString(value));
-        mColorModePref.setSummary(mColorModePref.getEntry());
-        mColorModePref.setOnPreferenceChangeListener(this);
-        mColorPref.setEnabled(value == 3);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final ContentResolver resolver = getContentResolver();
-        if (preference == mDurationPref) {
-            int value = (Integer) newValue;
-            Settings.System.putIntForUser(resolver,
-                    KEY_DURATION, value, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mRepeatsPref) {
-            int value = (Integer) newValue;
-            Settings.System.putIntForUser(resolver,
-                    KEY_REPEATS, value, UserHandle.USER_CURRENT);
-            updateTimeoutEnablement(value);
-            return true;
-        } else if (preference == mTimeoutPref) {
-            int value = Integer.valueOf((String) newValue);
-            int index = mTimeoutPref.findIndexOfValue((String) newValue);
-            mTimeoutPref.setSummary(mTimeoutPref.getEntries()[index]);
-            Settings.System.putIntForUser(resolver,
-                    KEY_TIMEOUT, value, UserHandle.USER_CURRENT);
-            return true;
-        } else if (preference == mColorModePref) {
-            int value = Integer.valueOf((String) newValue);
-            int index = mColorModePref.findIndexOfValue((String) newValue);
-            mColorModePref.setSummary(mColorModePref.getEntries()[index]);
-            Settings.System.putIntForUser(resolver,
-                    KEY_COLOR_MODE, value, UserHandle.USER_CURRENT);
-            mColorPref.setEnabled(value == 3);
-            return true;
-        } else if (preference == mColorPref) {
-            int accentColor = getAccentColor();
-            String hex = ColorPickerPreference.convertToARGB(
-                    Integer.valueOf(String.valueOf(newValue)));
-            if (hex.equals(String.format("#%08x", (0xFFFFFFFF & accentColor)))) {
-                preference.setSummary(R.string.default_string);
-            } else {
-                preference.setSummary(hex);
-            }
-            int color = ColorPickerPreference.convertToColorInt(hex);
-            Settings.System.putIntForUser(resolver,
-                    KEY_COLOR, color, UserHandle.USER_CURRENT);
-            return true;
-        }
-        return false;
-    }
-
-    private int getAccentColor() {
-        final TypedValue value = new TypedValue();
-        getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, value, true);
-        return value.data;
-    }
-
-    private void updateTimeoutEnablement(int repeats) {
-        if (repeats == 0) {
-            int value = Settings.System.getIntForUser(getContentResolver(),
-                    KEY_TIMEOUT, 0, UserHandle.USER_CURRENT);
-            mTimeoutPref.setValue(Integer.toString(value));
-            mTimeoutPref.setSummary(mTimeoutPref.getEntry());
-            mTimeoutPref.setEnabled(true);
-        } else {
-            mTimeoutPref.setSummary(R.string.set_to_zero);
-            mTimeoutPref.setEnabled(false);
-        }
-    }
-}

src/com/cherish/settings/fragments/HeadsUpSettings.java

@@ -1,412 +0,0 @@
-/*
- * Copyright (C) 2017 AospExtended ROM
- *
- * 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.os.Bundle;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.cherish.settings.preferences.PackageListAdapter;
-import com.cherish.settings.preferences.PackageListAdapter.PackageItem;
-import android.provider.Settings;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class HeadsUpSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
-
-    private static final int DIALOG_STOPLIST_APPS = 0;
-    private static final int DIALOG_BLACKLIST_APPS = 1;
-    private static final String PREF_HEADS_UP_TIME_OUT = "heads_up_time_out";
-    private static final String PREF_HEADS_UP_SNOOZE_TIME = "heads_up_snooze_time";
-
-    private PackageListAdapter mPackageAdapter;
-    private PackageManager mPackageManager;
-    private PreferenceGroup mStoplistPrefList;
-    private PreferenceGroup mBlacklistPrefList;
-    private Preference mAddStoplistPref;
-    private Preference mAddBlacklistPref;
-    private ListPreference mHeadsUpTimeOut;
-    private ListPreference mHeadsUpSnoozeTime;
-
-    private String mStoplistPackageList;
-    private String mBlacklistPackageList;
-    private Map<String, Package> mStoplistPackages;
-    private Map<String, Package> mBlacklistPackages;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Get launch-able applications
-        addPreferencesFromResource(R.xml.heads_up_settings);
-        mPackageManager = getPackageManager();
-        mPackageAdapter = new PackageListAdapter(getActivity());
-
-        mStoplistPrefList = (PreferenceGroup) findPreference("stoplist_applications");
-        mStoplistPrefList.setOrderingAsAdded(false);
-
-        mBlacklistPrefList = (PreferenceGroup) findPreference("blacklist_applications");
-        mBlacklistPrefList.setOrderingAsAdded(false);
-
-        mStoplistPackages = new HashMap<String, Package>();
-        mBlacklistPackages = new HashMap<String, Package>();
-
-        mAddStoplistPref = findPreference("add_stoplist_packages");
-        mAddBlacklistPref = findPreference("add_blacklist_packages");
-
-        mAddStoplistPref.setOnPreferenceClickListener(this);
-        mAddBlacklistPref.setOnPreferenceClickListener(this);
-
-        Resources systemUiResources;
-        try {
-            systemUiResources = getPackageManager().getResourcesForApplication("com.android.systemui");
-        } catch (Exception e) {
-            return;
-        }
-
-        int defaultTimeOut = systemUiResources.getInteger(systemUiResources.getIdentifier(
-                    "com.android.systemui:integer/heads_up_notification_decay", null, null));
-        mHeadsUpTimeOut = (ListPreference) findPreference(PREF_HEADS_UP_TIME_OUT);
-        mHeadsUpTimeOut.setOnPreferenceChangeListener(this);
-        int headsUpTimeOut = Settings.System.getInt(getContentResolver(),
-                Settings.System.HEADS_UP_TIMEOUT, defaultTimeOut);
-        mHeadsUpTimeOut.setValue(String.valueOf(headsUpTimeOut));
-        updateHeadsUpTimeOutSummary(headsUpTimeOut);
-
-        int defaultSnooze = systemUiResources.getInteger(systemUiResources.getIdentifier(
-                    "com.android.systemui:integer/heads_up_default_snooze_length_ms", null, null));
-        mHeadsUpSnoozeTime = (ListPreference) findPreference(PREF_HEADS_UP_SNOOZE_TIME);
-        mHeadsUpSnoozeTime.setOnPreferenceChangeListener(this);
-        int headsUpSnooze = Settings.System.getInt(getContentResolver(),
-                Settings.System.HEADS_UP_NOTIFICATION_SNOOZE, defaultSnooze);
-        mHeadsUpSnoozeTime.setValue(String.valueOf(headsUpSnooze));
-        updateHeadsUpSnoozeTimeSummary(headsUpSnooze);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mHeadsUpTimeOut) {
-            int headsUpTimeOut = Integer.valueOf((String) newValue);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.HEADS_UP_TIMEOUT,
-                    headsUpTimeOut);
-            updateHeadsUpTimeOutSummary(headsUpTimeOut);
-            return true;
-        } else if (preference == mHeadsUpSnoozeTime) {
-            int headsUpSnooze = Integer.valueOf((String) newValue);
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.HEADS_UP_NOTIFICATION_SNOOZE,
-                    headsUpSnooze);
-            updateHeadsUpSnoozeTimeSummary(headsUpSnooze);
-            return true;
-        }
-        return false;
-    }
-
-    private void updateHeadsUpTimeOutSummary(int value) {
-        String summary = getResources().getString(R.string.heads_up_time_out_summary,
-                value / 1000);
-        mHeadsUpTimeOut.setSummary(summary);
-    }
-
-    private void updateHeadsUpSnoozeTimeSummary(int value) {
-        if (value == 0) {
-            mHeadsUpSnoozeTime.setSummary(getResources().getString(R.string.heads_up_snooze_disabled_summary));
-        } else if (value == 60000) {
-            mHeadsUpSnoozeTime.setSummary(getResources().getString(R.string.heads_up_snooze_summary_one_minute));
-        } else {
-            String summary = getResources().getString(R.string.heads_up_snooze_summary, value / 60 / 1000);
-            mHeadsUpSnoozeTime.setSummary(summary);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refreshCustomApplicationPrefs();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_STOPLIST_APPS || dialogId == DIALOG_BLACKLIST_APPS) {
-            return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-        }
-        return 0;
-    }
-
-    /**
-     * Utility classes and supporting methods
-     */
-    @Override
-    public Dialog onCreateDialog(int id) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        final Dialog dialog;
-        final ListView list = new ListView(getActivity());
-        list.setAdapter(mPackageAdapter);
-
-        builder.setTitle(R.string.profile_choose_app);
-        builder.setView(list);
-        dialog = builder.create();
-
-        switch (id) {
-            case DIALOG_STOPLIST_APPS:
-                list.setOnItemClickListener(new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                        // Add empty application definition, the user will be able to edit it later
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mStoplistPackages);
-                        dialog.cancel();
-                    }
-                });
-                break;
-            case DIALOG_BLACKLIST_APPS:
-                list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent,
-                            View view, int position, long id) {
-                        PackageItem info = (PackageItem) parent.getItemAtPosition(position);
-                        addCustomApplicationPref(info.packageName, mBlacklistPackages);
-                        dialog.cancel();
-                    }
-                });
-        }
-        return dialog;
-    }
-
-    /**
-     * Application class
-     */
-    private static class Package {
-        public String name;
-        /**
-         * Stores all the application values in one call
-         * @param name
-         */
-        public Package(String name) {
-            this.name = name;
-        }
-
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append(name);
-            return builder.toString();
-        }
-
-        public static Package fromString(String value) {
-            if (TextUtils.isEmpty(value)) {
-                return null;
-            }
-
-            try {
-                Package item = new Package(value);
-                return item;
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        }
-
-    };
-
-    private void refreshCustomApplicationPrefs() {
-        if (!parsePackageList()) {
-            return;
-        }
-
-        // Add the Application Preferences
-        if (mStoplistPrefList != null && mBlacklistPrefList != null) {
-            mStoplistPrefList.removeAll();
-            mBlacklistPrefList.removeAll();
-
-            for (Package pkg : mStoplistPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mStoplistPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-
-            for (Package pkg : mBlacklistPackages.values()) {
-                try {
-                    Preference pref = createPreferenceFromInfo(pkg);
-                    mBlacklistPrefList.addPreference(pref);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-        }
-
-        // Keep these at the top
-        mAddStoplistPref.setOrder(0);
-        mAddBlacklistPref.setOrder(0);
-        // Add 'add' options
-        mStoplistPrefList.addPreference(mAddStoplistPref);
-        mBlacklistPrefList.addPreference(mAddBlacklistPref);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mAddStoplistPref) {
-            showDialog(DIALOG_STOPLIST_APPS);
-        } else if (preference == mAddBlacklistPref) {
-            showDialog(DIALOG_BLACKLIST_APPS);
-        } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.dialog_delete_title)
-                    .setMessage(R.string.dialog_delete_message)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            if (preference == mBlacklistPrefList.findPreference(preference.getKey())) {
-                                 removeApplicationPref(preference.getKey(), mBlacklistPackages);
-                            } else if (preference == mStoplistPrefList.findPreference(preference.getKey())) {
-                                removeApplicationPref(preference.getKey(), mStoplistPackages);
-                            }
-                        }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null);
-
-        builder.show();
-        }
-        return true;
-    }
-
-     private void addCustomApplicationPref(String packageName, Map<String,Package> map) {
-        Package pkg = map.get(packageName);
-        if (pkg == null) {
-            pkg = new Package(packageName);
-            map.put(packageName, pkg);
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private Preference createPreferenceFromInfo(Package pkg)
-            throws PackageManager.NameNotFoundException {
-        PackageInfo info = mPackageManager.getPackageInfo(pkg.name,
-                PackageManager.GET_META_DATA);
-        Preference pref =
-                new Preference(getActivity());
-
-        pref.setKey(pkg.name);
-        pref.setTitle(info.applicationInfo.loadLabel(mPackageManager));
-        pref.setIcon(info.applicationInfo.loadIcon(mPackageManager));
-        pref.setPersistent(false);
-        pref.setLayoutResource(R.layout.headsup_preference_applist);
-        pref.setOnPreferenceClickListener(this);
-        return pref;
-    }
-
-    private void removeApplicationPref(String packageName, Map<String,Package> map) {
-        if (map.remove(packageName) != null) {
-            savePackageList(false, map);
-            refreshCustomApplicationPrefs();
-        }
-    }
-
-    private boolean parsePackageList() {
-        boolean parsed = false;
-
-        final String stoplistString = Settings.System.getString(getContentResolver(),
-                Settings.System.HEADS_UP_STOPLIST_VALUES);
-        final String blacklistString = Settings.System.getString(getContentResolver(),
-                Settings.System.HEADS_UP_BLACKLIST_VALUES);
-
-        if (!TextUtils.equals(mStoplistPackageList, stoplistString)) {
-            mStoplistPackageList = stoplistString;
-            mStoplistPackages.clear();
-            parseAndAddToMap(stoplistString, mStoplistPackages);
-            parsed = true;
-        }
-
-        if (!TextUtils.equals(mBlacklistPackageList, blacklistString)) {
-            mBlacklistPackageList = blacklistString;
-            mBlacklistPackages.clear();
-            parseAndAddToMap(blacklistString, mBlacklistPackages);
-            parsed = true;
-        }
-
-        return parsed;
-    }
-
-    private void parseAndAddToMap(String baseString, Map<String,Package> map) {
-        if (baseString == null) {
-            return;
-        }
-
-        final String[] array = TextUtils.split(baseString, "\\|");
-        for (String item : array) {
-            if (TextUtils.isEmpty(item)) {
-                continue;
-            }
-            Package pkg = Package.fromString(item);
-            map.put(pkg.name, pkg);
-        }
-    }
-
-
-    private void savePackageList(boolean preferencesUpdated, Map<String,Package> map) {
-        String setting = map == mStoplistPackages
-                ? Settings.System.HEADS_UP_STOPLIST_VALUES
-                : Settings.System.HEADS_UP_BLACKLIST_VALUES;
-
-        List<String> settings = new ArrayList<String>();
-        for (Package app : map.values()) {
-            settings.add(app.toString());
-        }
-        final String value = TextUtils.join("|", settings);
-        if (preferencesUpdated) {
-            if (TextUtils.equals(setting, Settings.System.HEADS_UP_STOPLIST_VALUES)) {
-                mStoplistPackageList = value;
-            } else {
-                mBlacklistPackageList = value;
-            }
-        }
-        Settings.System.putString(getContentResolver(),
-                setting, value);
-    }
-}

src/com/cherish/settings/fragments/LockScreenSettings.java

@@ -41,6 +41,7 @@ import android.os.SystemProperties;
 import android.provider.Settings;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.internal.util.cherish.udfps.UdfpsUtils;
 import com.android.internal.util.cherish.CherishUtils;
 import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.CustomSeekBarPreference;
@@ -50,16 +51,32 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 import android.provider.SearchIndexableResource;
-import com.android.internal.util.cherish.fod.FodUtils;
-import com.android.internal.util.cherish.CherishUtils;
-import java.util.ArrayList;
+import android.widget.Toast;
+
 import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collections;
+import java.io.FileDescriptor;
+import java.util.Arrays;
+import org.json.JSONException;
+import org.json.JSONObject;
+import static android.os.UserHandle.USER_SYSTEM;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import static android.os.UserHandle.USER_CURRENT;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 			
 	private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
+	private static final String CUSTOM_CLOCK_FACE = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE;
+    private static final String DEFAULT_CLOCK = "com.android.keyguard.clock.DefaultClockController";
+	private static final String UDFPS_CATEGORY = "udfps_category";
+	private static final String TORCH_POWER_BUTTON_GESTURE = "torch_power_button_gesture";
+        private static final String KG_CUSTOM_CLOCK_COLOR_ENABLED = "kg_custom_clock_color_enabled";
 	
 	static final int MODE_DISABLED = 0;
     static final int MODE_NIGHT = 1;
@@ -67,17 +84,20 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
     static final int MODE_MIXED_SUNSET = 3;
     static final int MODE_MIXED_SUNRISE = 4;
 	
+	private ListPreference mLockClockStyles;
+	private PreferenceCategory mUdfpsCategory;
+	private Context mContext;
+	private ListPreference mTorchPowerButton;
+        private SwitchPreference mKGCustomClockColor;
+	
 	Preference mAODPref;
-	Preference mFODPref;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.cherish_settings_lockscreen);
-
-        ContentResolver resolver = getActivity().getContentResolver();
-        PreferenceScreen prefScreen = getPreferenceScreen();
-        Resources resources = getResources();
+        final ContentResolver resolver = getActivity().getContentResolver();
+        final PreferenceScreen prefSet = getPreferenceScreen();
 		
 		Resources res = null;
         Context ctx = getContext();
@@ -89,13 +109,32 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
             e.printStackTrace();
         }
 		
-		PreferenceCategory udfps = (PreferenceCategory) prefScreen.findPreference("udfps_category");
-        if (!FodUtils.hasFodSupport(getContext())) {
-            prefScreen.removePreference(udfps);
+		mUdfpsCategory = findPreference(UDFPS_CATEGORY);
+        if (!UdfpsUtils.hasUdfpsSupport(getContext())) {
+            prefSet.removePreference(mUdfpsCategory);
         }
 		
 		mAODPref = findPreference(AOD_SCHEDULE_KEY);
         updateAlwaysOnSummary();
+		
+		mLockClockStyles = (ListPreference) findPreference(CUSTOM_CLOCK_FACE);
+        String mLockClockStylesValue = getLockScreenCustomClockFace();
+        mLockClockStyles.setValue(mLockClockStylesValue);
+        mLockClockStyles.setSummary(mLockClockStyles.getEntry());
+        mLockClockStyles.setOnPreferenceChangeListener(this);
+        mKGCustomClockColor = (SwitchPreference) findPreference(KG_CUSTOM_CLOCK_COLOR_ENABLED);
+        boolean mKGCustomClockColorEnabled = Settings.Secure.getIntForUser(resolver,
+                Settings.Secure.KG_CUSTOM_CLOCK_COLOR_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
+        mKGCustomClockColor.setChecked(mKGCustomClockColorEnabled);
+        mKGCustomClockColor.setOnPreferenceChangeListener(this);
+
+        // screen off torch
+        mTorchPowerButton = (ListPreference) findPreference(TORCH_POWER_BUTTON_GESTURE);
+        int mTorchPowerButtonValue = Settings.System.getInt(resolver,
+                Settings.System.TORCH_POWER_BUTTON_GESTURE, 0);
+        mTorchPowerButton.setValue(Integer.toString(mTorchPowerButtonValue));
+        mTorchPowerButton.setSummary(mTorchPowerButton.getEntry());
+        mTorchPowerButton.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -130,8 +169,52 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
+	    if (preference == mLockClockStyles) {
+            setLockScreenCustomClockFace((String) newValue);
+            int index = mLockClockStyles.findIndexOfValue((String) newValue);
+            mLockClockStyles.setSummary(mLockClockStyles.getEntries()[index]);
+            return true;
+         } else if (preference == mTorchPowerButton) {
+            int mTorchPowerButtonValue = Integer.valueOf((String) newValue);
+            int index = mTorchPowerButton.findIndexOfValue((String) newValue);
+            mTorchPowerButton.setSummary(
+                    mTorchPowerButton.getEntries()[index]);
+            Settings.System.putInt(resolver, Settings.System.TORCH_POWER_BUTTON_GESTURE,
+                    mTorchPowerButtonValue);
+            return true;
+        } else if (preference == mKGCustomClockColor) {
+            boolean val = (Boolean) newValue;
+            Settings.Secure.putIntForUser(resolver,
+                Settings.Secure.KG_CUSTOM_CLOCK_COLOR_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
+            return true;
+        }
         return false;
     }
+	
+	private String getLockScreenCustomClockFace() {
+        mContext = getActivity();
+        String value = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                CUSTOM_CLOCK_FACE, USER_CURRENT);
+
+        if (value == null || value.isEmpty()) value = DEFAULT_CLOCK;
+
+        try {
+            JSONObject json = new JSONObject(value);
+            return json.getString("clock");
+        } catch (JSONException ex) {
+        }
+        return value;
+    }
+
+    private void setLockScreenCustomClockFace(String value) {
+        try {
+            JSONObject json = new JSONObject();
+            json.put("clock", value);
+            Settings.Secure.putStringForUser(mContext.getContentResolver(), CUSTOM_CLOCK_FACE,
+                    json.toString(), USER_CURRENT);
+        } catch (JSONException ex) {
+        }
+    }
 
     @Override
     public int getMetricsCategory() {

src/com/cherish/settings/fragments/MiscSettings.java

@@ -32,79 +32,86 @@ import java.util.HashSet;
 
 import android.content.pm.PackageManager.NameNotFoundException;
 import com.android.settings.SettingsPreferenceFragment;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
+import com.cherish.settings.preferences.SystemSettingEditTextPreference;
 import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference;
 import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.SecureSettingSwitchPreference;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.development.SystemPropPoker;
 import com.android.settingslib.search.SearchIndexable;
 import android.provider.SearchIndexableResource;
 
+import com.cherish.settings.fragments.SmartCharging;
 import java.util.ArrayList;
 import java.util.List;
 
-@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+@SearchIndexable
 public class MiscSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-			
 	private static final String KEY_GAMES_SPOOF = "use_games_spoof";
     private static final String KEY_PHOTOS_SPOOF = "use_photos_spoof";
-    private static final String KEY_STREAM_SPOOF = "use_stream_spoof";
+    private static final String KEY_NETFLIX_SPOOF = "use_netflix_spoof";
 
     private static final String SYS_GAMES_SPOOF = "persist.sys.pixelprops.games";
     private static final String SYS_PHOTOS_SPOOF = "persist.sys.pixelprops.gphotos";
-    private static final String SYS_STREAM_SPOOF = "persist.sys.pixelprops.streaming";
+	private static final String SYS_NETFLIX_SPOOF = "persist.sys.spoof_netflix";
+
+	private static final String SMART_CHARGING = "smart_charging";
 
     private SwitchPreference mGamesSpoof;
     private SwitchPreference mPhotosSpoof;
-    private SwitchPreference mStreamSpoof;
+	private Preference mSmartCharging;
+    private SwitchPreference mNetFlixSpoof;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         ContentResolver resolver = getActivity().getContentResolver();
-        PreferenceScreen prefSet = getPreferenceScreen();
 
         addPreferencesFromResource(R.xml.cherish_settings_misc);
-		
-		Resources res = null;
-        Context ctx = getContext();
-        float density = Resources.getSystem().getDisplayMetrics().density;
-
-        try {
-            res = ctx.getPackageManager().getResourcesForApplication("com.android.systemui");
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
+	
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+        final Resources res = getResources();
 		
 		mGamesSpoof = (SwitchPreference) findPreference(KEY_GAMES_SPOOF);
         mGamesSpoof.setChecked(SystemProperties.getBoolean(SYS_GAMES_SPOOF, false));
         mGamesSpoof.setOnPreferenceChangeListener(this);
-
-        mPhotosSpoof = (SwitchPreference) findPreference(KEY_PHOTOS_SPOOF);
+		
+		mPhotosSpoof = (SwitchPreference) findPreference(KEY_PHOTOS_SPOOF);
         mPhotosSpoof.setChecked(SystemProperties.getBoolean(SYS_PHOTOS_SPOOF, true));
         mPhotosSpoof.setOnPreferenceChangeListener(this);
 
-        mStreamSpoof = (SwitchPreference) findPreference(KEY_STREAM_SPOOF);
-        mStreamSpoof.setChecked(SystemProperties.getBoolean(SYS_STREAM_SPOOF, true));
-        mStreamSpoof.setOnPreferenceChangeListener(this);
+        mNetFlixSpoof = (SwitchPreference) findPreference(KEY_NETFLIX_SPOOF);
+        mNetFlixSpoof.setChecked(SystemProperties.getBoolean(SYS_NETFLIX_SPOOF, false));
+        mNetFlixSpoof.setOnPreferenceChangeListener(this);
+		
+		mSmartCharging = (Preference) prefScreen.findPreference(SMART_CHARGING);
+        boolean mSmartChargingSupported = res.getBoolean(
+                com.android.internal.R.bool.config_smartChargingAvailable);
+        if (!mSmartChargingSupported)
+            prefScreen.removePreference(mSmartCharging);
 
     }
 
-    @Override
+     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mGamesSpoof) {
             boolean value = (Boolean) newValue;
             SystemProperties.set(SYS_GAMES_SPOOF, value ? "true" : "false");
+            SystemPropPoker.getInstance().poke();
             return true;
-        } else if (preference == mPhotosSpoof) {
+		} else if (preference == mPhotosSpoof) {
             boolean value = (Boolean) newValue;
             SystemProperties.set(SYS_PHOTOS_SPOOF, value ? "true" : "false");
+            SystemPropPoker.getInstance().poke();
             return true;
-        } else if (preference == mStreamSpoof) {
+        } else if (preference == mNetFlixSpoof) {
             boolean value = (Boolean) newValue;
-            SystemProperties.set(SYS_STREAM_SPOOF, value ? "true" : "false");
+            SystemProperties.set(SYS_NETFLIX_SPOOF, value ? "true" : "false");
+            SystemPropPoker.getInstance().poke();
             return true;
-        }
+		}
         return false;
     }
 	
@@ -113,29 +120,19 @@ public class MiscSettings extends SettingsPreferenceFragment implements
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
-	
-	/**
-     * For Search.
-     */
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    ArrayList<SearchIndexableResource> result =
-                            new ArrayList<SearchIndexableResource>();
-                    SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.cherish_settings_misc;
-                    result.add(sir);
-                    return result;
-                }
 
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_misc) {
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
+
+                    boolean mSmartChargingSupported = context.getResources().getBoolean(
+                            com.android.internal.R.bool.config_smartChargingAvailable);
+                    if (!mSmartChargingSupported)
+                        keys.add(SMART_CHARGING);
+
                     return keys;
                 }
-    };
+            };
 }

src/com/cherish/settings/fragments/NavBarInversePreferenceController.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 AOSP-Krypton Project
+ * Copyright (C) 2022 PixelPlusUI Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,4 +39,4 @@ class NavBarInversePreferenceController(
         else
             DISABLED_DEPENDENT_SETTING
     }
-}
+} 

src/com/cherish/settings/fragments/NetworkTrafficSettings.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2019-22 The CherishOS
+ *
+ * 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.
+ */
+
+package com.cherish.settings.fragments;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.view.View;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
+import com.cherish.settings.preferences.SystemSettingMainSwitchPreference;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class NetworkTrafficSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+
+    private SystemSettingSwitchPreference mThreshold;
+    private SystemSettingMainSwitchPreference mNetMonitor;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.cherish_settings_network_traffic);
+
+        final ContentResolver resolver = getActivity().getContentResolver();
+
+        boolean isNetMonitorEnabled = Settings.System.getIntForUser(resolver,
+                Settings.System.NETWORK_TRAFFIC_STATE, 1, UserHandle.USER_CURRENT) == 1;
+        mNetMonitor = (SystemSettingMainSwitchPreference) findPreference("network_traffic_state");
+        mNetMonitor.setChecked(isNetMonitorEnabled);
+        mNetMonitor.setOnPreferenceChangeListener(this);
+
+        boolean isThresholdEnabled = Settings.System.getIntForUser(resolver,
+                Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, 0, UserHandle.USER_CURRENT) == 1;
+        mThreshold = (SystemSettingSwitchPreference) findPreference("network_traffic_autohide_threshold");
+        mThreshold.setChecked(isThresholdEnabled);
+        mThreshold.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        ContentResolver resolver = getActivity().getContentResolver();
+        if (preference == mNetMonitor) {
+            boolean value = (Boolean) newValue;
+            Settings.System.putIntForUser(resolver,
+                    Settings.System.NETWORK_TRAFFIC_STATE, value ? 1 : 0,
+                    UserHandle.USER_CURRENT);
+            mNetMonitor.setChecked(value);
+            mThreshold.setChecked(value);
+            return true;
+        } else if (preference == mThreshold) {
+            boolean value = (Boolean) newValue;
+            Settings.System.putIntForUser(resolver,
+                    Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, value ? 1 : 0,
+                    UserHandle.USER_CURRENT);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CHERISH_SETTINGS;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_network_traffic);
+}

src/com/cherish/settings/fragments/NotificationSettings.java

@@ -31,8 +31,6 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 import net.margaritov.preference.colorpicker.ColorPickerPreference;
 import com.android.internal.util.cherish.CherishUtils;
-import com.cherish.settings.preferences.Utils;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,18 +38,14 @@ import java.util.List;
 public class NotificationSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener{
 
     private static final String INCALL_VIB_OPTIONS = "incall_vib_options";
-    private static final String PREF_FLASH_ON_CALL = "flashlight_on_call";
-    private static final String PREF_FLASH_ON_CALL_DND = "flashlight_on_call_ignore_dnd";
-    private static final String PREF_FLASH_ON_CALL_RATE = "flashlight_on_call_rate";
-	private static final String KEY_EDGE_LIGHTNING = "pulse_ambient_light";
-	private static final String RETICKER_STATUS = "reticker_status";
+	private static final String ALERT_SLIDER_PREF = "alert_slider_notifications";
+	
+	private static final String NEW_RETICKER = "new_reticker";
+    private static final String NEW_RETICKER_ANIMATION = "new_reticker_animation";
 
-    private SystemSettingMasterSwitchPreference mEdgeLightning;
-    private SystemSettingListPreference mFlashOnCall;
-    private SystemSettingSwitchPreference mFlashOnCallIgnoreDND;
-    private CustomSeekBarPreference mFlashOnCallRate;
-	private Preference mChargingLeds;
-	private SystemSettingSwitchPreference mRetickerStatus;
+    private Preference mChargingLeds;
+	private Preference mAlertSlider;
+	private SystemSettingSwitchPreference mNewReticker, mNewRetickerAnimation;
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -60,37 +54,12 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
         ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
         final Resources res = getResources();
-		
-		PreferenceCategory incallVibCategory = (PreferenceCategory) findPreference(INCALL_VIB_OPTIONS);
-        if (!Utils.isVoiceCapable(getActivity())) {
-                prefScreen.removePreference(incallVibCategory);
-        }
-		
-		mFlashOnCallRate = (CustomSeekBarPreference)
-                findPreference(PREF_FLASH_ON_CALL_RATE);
-        int value = Settings.System.getInt(resolver,
-                Settings.System.FLASHLIGHT_ON_CALL_RATE, 1);
-        mFlashOnCallRate.setValue(value);
-        mFlashOnCallRate.setOnPreferenceChangeListener(this);
-
-        mFlashOnCallIgnoreDND = (SystemSettingSwitchPreference)
-                findPreference(PREF_FLASH_ON_CALL_DND);
-        value = Settings.System.getInt(resolver,
-                Settings.System.FLASHLIGHT_ON_CALL, 0);
-        mFlashOnCallIgnoreDND.setVisible(value > 1);
-        mFlashOnCallRate.setVisible(value != 0);
-
-        mFlashOnCall = (SystemSettingListPreference)
-                findPreference(PREF_FLASH_ON_CALL);
-        mFlashOnCall.setSummary(mFlashOnCall.getEntries()[value]);
-        mFlashOnCall.setOnPreferenceChangeListener(this);
-		
-		mEdgeLightning = (SystemSettingMasterSwitchPreference)
-                findPreference(KEY_EDGE_LIGHTNING);
-        boolean enabled = Settings.System.getIntForUser(resolver,
-                KEY_EDGE_LIGHTNING, 0, UserHandle.USER_CURRENT) == 1;
-        mEdgeLightning.setChecked(enabled);
-        mEdgeLightning.setOnPreferenceChangeListener(this);
+	
+		mAlertSlider = (Preference) prefScreen.findPreference(ALERT_SLIDER_PREF);
+        boolean mAlertSliderAvailable = res.getBoolean(
+                com.android.internal.R.bool.config_hasAlertSlider);
+        if (!mAlertSliderAvailable)
+            prefScreen.removePreference(mAlertSlider);
 
         mChargingLeds = (Preference) findPreference("charging_light");
         if (mChargingLeds != null
@@ -98,42 +67,25 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
                         com.android.internal.R.bool.config_intrusiveBatteryLed)) {
             prefScreen.removePreference(mChargingLeds);
         }
+
+        PreferenceCategory incallVibCategory = (PreferenceCategory) findPreference(INCALL_VIB_OPTIONS);
+        if (!CherishUtils.isVoiceCapable(getActivity())) {
+                prefScreen.removePreference(incallVibCategory);
+        }
 		
-		mRetickerStatus = findPreference(RETICKER_STATUS);
-        mRetickerStatus.setChecked((Settings.System.getInt(resolver,
-                Settings.System.RETICKER_STATUS, 0) == 1));
-        mRetickerStatus.setOnPreferenceChangeListener(this);
+		mNewReticker = (SystemSettingSwitchPreference) findPreference(NEW_RETICKER);
+        mNewReticker.setOnPreferenceChangeListener(this);
+        mNewRetickerAnimation = (SystemSettingSwitchPreference) findPreference(NEW_RETICKER_ANIMATION);
+        mNewRetickerAnimation.setOnPreferenceChangeListener(this);
         
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-		final ContentResolver resolver = getActivity().getContentResolver();
-		if (preference == mFlashOnCall) {
-            int value = Integer.parseInt((String) newValue);
-            Settings.System.putInt(resolver,
-                    Settings.System.FLASHLIGHT_ON_CALL, value);
-            mFlashOnCall.setSummary(mFlashOnCall.getEntries()[value]);
-            mFlashOnCallIgnoreDND.setVisible(value > 1);
-            mFlashOnCallRate.setVisible(value != 0);
+         if (preference == mNewReticker || preference == mNewRetickerAnimation) {
+            CherishUtils.showSystemUiRestartDialog(getActivity());
             return true;
-        } else if (preference == mFlashOnCallRate) {
-            int value = (Integer) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.FLASHLIGHT_ON_CALL_RATE, value);
-            return true;
-        } else if (preference == mEdgeLightning) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putIntForUser(resolver, KEY_EDGE_LIGHTNING,
-                    value ? 1 : 0, UserHandle.USER_CURRENT);
-            return true;
-		} else if (preference == mRetickerStatus) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putInt(resolver,
-                    Settings.System.RETICKER_STATUS, value ? 1 : 0);
-            CherishUtils.showSettingsRestartDialog(getContext());
-            return true;
-        }
+		 }
         return false;
     }
 
@@ -164,6 +116,10 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
                     final Resources res = context.getResources();
+                    boolean mAlertSliderAvailable = res.getBoolean(
+                            com.android.internal.R.bool.config_hasAlertSlider);
+                    if (!mAlertSliderAvailable)
+                        keys.add(ALERT_SLIDER_PREF);
                     return keys;
                 }
     };

src/com/cherish/settings/fragments/OmniJawsSettings.java

@@ -0,0 +1,189 @@
+/*
+ *  Copyright (C) 2017 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+
+package com.cherish.settings.fragments;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.Indexable;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class OmniJawsSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener, Indexable {
+    private static final String TAG = "OmniJawsSettings";
+    private static final String CATEGORY_WEATHER = "weather_category";
+    private static final String WEATHER_ICON_PACK = "weather_icon_pack";
+    private static final String DEFAULT_WEATHER_ICON_PACKAGE = "org.omnirom.omnijaws";
+    private static final String DEFAULT_WEATHER_ICON_PREFIX = "outline";
+    private static final String WEATHER_SERVICE_PACKAGE = "org.omnirom.omnijaws";
+    private static final String CHRONUS_ICON_PACK_INTENT = "com.dvtonder.chronus.ICON_PACK";
+
+    private PreferenceCategory mWeatherCategory;
+    private ListPreference mWeatherIconPack;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CHERISH_SETTINGS;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.omnijaws_settings);
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+
+        mWeatherCategory = (PreferenceCategory) prefScreen.findPreference(CATEGORY_WEATHER);
+        if (mWeatherCategory != null) {
+            prefScreen.removePreference(mWeatherCategory);
+        } else {
+            String settingHeaderPackage = Settings.System.getString(getContentResolver(),
+                    Settings.System.OMNIJAWS_WEATHER_ICON_PACK);
+            if (settingHeaderPackage == null) {
+                settingHeaderPackage = DEFAULT_WEATHER_ICON_PACKAGE + "." + DEFAULT_WEATHER_ICON_PREFIX;
+            }
+            mWeatherIconPack = (ListPreference) findPreference(WEATHER_ICON_PACK);
+
+            List<String> entries = new ArrayList<String>();
+            List<String> values = new ArrayList<String>();
+            getAvailableWeatherIconPacks(entries, values);
+            mWeatherIconPack.setEntries(entries.toArray(new String[entries.size()]));
+            mWeatherIconPack.setEntryValues(values.toArray(new String[values.size()]));
+
+            int valueIndex = mWeatherIconPack.findIndexOfValue(settingHeaderPackage);
+            if (valueIndex == -1) {
+                // no longer found
+                settingHeaderPackage = DEFAULT_WEATHER_ICON_PACKAGE + "." + DEFAULT_WEATHER_ICON_PREFIX;
+                Settings.System.putString(getContentResolver(),
+                        Settings.System.OMNIJAWS_WEATHER_ICON_PACK, settingHeaderPackage);
+                valueIndex = mWeatherIconPack.findIndexOfValue(settingHeaderPackage);
+            }
+            mWeatherIconPack.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
+            mWeatherIconPack.setSummary(mWeatherIconPack.getEntry());
+            mWeatherIconPack.setOnPreferenceChangeListener(this);
+        }
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        if (preference == mWeatherIconPack) {
+            String value = (String) objValue;
+            Settings.System.putString(getContentResolver(),
+                    Settings.System.OMNIJAWS_WEATHER_ICON_PACK, value);
+            int valueIndex = mWeatherIconPack.findIndexOfValue(value);
+            mWeatherIconPack.setSummary(mWeatherIconPack.getEntries()[valueIndex]);
+        }
+        return true;
+    }
+
+    private void getAvailableWeatherIconPacks(List<String> entries, List<String> values) {
+        Intent i = new Intent();
+        PackageManager packageManager = getPackageManager();
+        i.setAction("org.omnirom.WeatherIconPack");
+        for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
+            String packageName = r.activityInfo.packageName;
+            if (packageName.equals(DEFAULT_WEATHER_ICON_PACKAGE)) {
+                values.add(0, r.activityInfo.name);
+            } else {
+                values.add(r.activityInfo.name);
+            }
+            String label = r.activityInfo.loadLabel(getPackageManager()).toString();
+            if (label == null) {
+                label = r.activityInfo.packageName;
+            }
+            if (packageName.equals(DEFAULT_WEATHER_ICON_PACKAGE)) {
+                entries.add(0, label);
+            } else {
+                entries.add(label);
+            }
+        }
+        i = new Intent(Intent.ACTION_MAIN);
+        i.addCategory(CHRONUS_ICON_PACK_INTENT);
+        for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
+            String packageName = r.activityInfo.packageName;
+            values.add(packageName + ".weather");
+            String label = r.activityInfo.loadLabel(getPackageManager()).toString();
+            if (label == null) {
+                label = r.activityInfo.packageName;
+            }
+            entries.add(label);
+        }
+    }
+
+    private boolean isOmniJawsEnabled() {
+        final Uri SETTINGS_URI
+            = Uri.parse("content://org.omnirom.omnijaws.provider/settings");
+
+        final String[] SETTINGS_PROJECTION = new String[] {
+            "enabled"
+        };
+
+        final Cursor c = getContentResolver().query(SETTINGS_URI, SETTINGS_PROJECTION,
+                null, null, null);
+        if (c != null) {
+            int count = c.getCount();
+            if (count == 1) {
+                c.moveToPosition(0);
+                boolean enabled = c.getInt(0) == 1;
+                return enabled;
+            }
+        }
+        return true;
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    ArrayList<SearchIndexableResource> result =
+                            new ArrayList<SearchIndexableResource>();
+
+                    SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.omnijaws_settings;
+                    result.add(sir);
+
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    ArrayList<String> result = new ArrayList<String>();
+                    return result;
+                }
+    };
+}

src/com/cherish/settings/fragments/QuickSettings.java

@@ -38,16 +38,18 @@ public class QuickSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 			
 	private ListPreference mQuickPulldown;
+	
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.cherish_settings_quicksettings);
 
-        PreferenceScreen prefScreen = getPreferenceScreen();
-        ContentResolver resolver = getActivity().getContentResolver();
-		
-		int qpmode = Settings.System.getIntForUser(getContentResolver(),
+        final Context mContext = getActivity().getApplicationContext();
+        final ContentResolver resolver = mContext.getContentResolver();
+        final PreferenceScreen prefSet = getPreferenceScreen();
+
+        int qpmode = Settings.System.getIntForUser(getContentResolver(),
                 Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0, UserHandle.USER_CURRENT);
         mQuickPulldown = (ListPreference) findPreference("status_bar_quick_qs_pulldown");
         mQuickPulldown.setValue(String.valueOf(qpmode));
@@ -58,7 +60,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-		if (preference == mQuickPulldown) {
+        if (preference == mQuickPulldown) {
             int value = Integer.parseInt((String) newValue);
             Settings.System.putIntForUser(resolver,
                     Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, value,
@@ -67,10 +69,11 @@ public class QuickSettings extends SettingsPreferenceFragment implements
             mQuickPulldown.setSummary(
                     mQuickPulldown.getEntries()[index]);
             return true;
-		}
+        }
         return false;
     }
 
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;

src/com/cherish/settings/fragments/SmartCharging.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020-2022 The CherishOS 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.
+ */
+
+package com.cherish.settings.fragments;
+
+import android.content.Context;
+import android.content.ContentResolver;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+public class SmartCharging extends SettingsPreferenceFragment {
+
+    private static final String TAG = "SmartCharging";
+    private static final String SMART_CHARGING_FOOTER = "smart_charging_footer";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.smart_charging);
+
+        findPreference(SMART_CHARGING_FOOTER).setTitle(R.string.smart_charging_footer);
+    }
+
+    public static void reset(Context mContext) {
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putIntForUser(resolver,
+                Settings.System.SMART_CHARGING, 0, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.SMART_CHARGING_RESET_STATS, 0, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.SMART_CHARGING_LEVEL, 80, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.SMART_CHARGING_RESUME_LEVEL, 60, UserHandle.USER_CURRENT);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
+    }
+}

src/com/cherish/settings/fragments/StatusBarBattery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 The CyanogenMod Project
+ * Copyright (C) 2017-2019 The Dirty Unicorns Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,91 +13,110 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.cherish.settings.fragments;
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.os.Bundle;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
+import android.os.UserHandle;
 import android.provider.Settings;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
-public class StatusBarBattery extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
+import com.cherish.settings.preferences.SystemSettingListPreference;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 
-    private static final String SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
+import java.util.ArrayList;
+import java.util.List;
+
+public class StatusBarBattery extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+    private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
     private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
+    private static final String STATUS_BAR_BATTERY_TEXT_CHARGING = "status_bar_battery_text_charging";
 
-    private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 3;
+    private SwitchPreference mBatteryTextCharging;
 
-    private ListPreference mStatusBarBatteryShowPercent;
-    private ListPreference mStatusBarBattery;
+    private SystemSettingListPreference mBatteryPercent;
+    private SystemSettingListPreference mBatteryStyle;
+
+    private static final int BATTERY_STYLE_PORTRAIT = 0;
+    private static final int BATTERY_STYLE_TEXT = 4;
+    private static final int BATTERY_STYLE_HIDDEN = 5;
+    private static final int BATTERY_PERCENT_HIDDEN = 0;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         addPreferencesFromResource(R.xml.statusbar_battery);
 
-        ContentResolver resolver = getActivity().getContentResolver();
+        int batterystyle = Settings.System.getIntForUser(getContentResolver(),
+                Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_PORTRAIT, UserHandle.USER_CURRENT);
+        int batterypercent = Settings.System.getIntForUser(getContentResolver(),
+                Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0, UserHandle.USER_CURRENT);
 
-        mStatusBarBatteryShowPercent =
-                (ListPreference) findPreference(SHOW_BATTERY_PERCENT);
+        mBatteryStyle = (SystemSettingListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
+        mBatteryStyle.setOnPreferenceChangeListener(this);
 
-        int batteryShowPercent = Settings.System.getInt(resolver,
-                Settings.System.SHOW_BATTERY_PERCENT, 0);
-        mStatusBarBatteryShowPercent.setValue(String.valueOf(batteryShowPercent));
-        mStatusBarBatteryShowPercent.setSummary(mStatusBarBatteryShowPercent.getEntry());
-        mStatusBarBatteryShowPercent.setOnPreferenceChangeListener(this);
+        mBatteryPercent = (SystemSettingListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
+        mBatteryPercent.setEnabled(
+                batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
+        mBatteryPercent.setOnPreferenceChangeListener(this);
 
-        mStatusBarBattery = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
-         int batteryStyle = Settings.Secure.getInt(resolver,
-                Settings.Secure.STATUS_BAR_BATTERY_STYLE, 0);
-        mStatusBarBattery.setValue(String.valueOf(batteryStyle));
-        mStatusBarBattery.setSummary(mStatusBarBattery.getEntry());
-        enableStatusBarBatteryDependents(batteryStyle);
-        mStatusBarBattery.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CHERISH_SETTINGS;
+        mBatteryTextCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING);
+        mBatteryTextCharging.setEnabled(batterystyle == BATTERY_STYLE_HIDDEN ||
+                (batterystyle != BATTERY_STYLE_TEXT && batterypercent != 2));
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mStatusBarBatteryShowPercent) {
-            int batteryShowPercent = Integer.valueOf((String) newValue);
-            int index = mStatusBarBatteryShowPercent.findIndexOfValue((String) newValue);
-            Settings.System.putInt(
-                    resolver, Settings.System.SHOW_BATTERY_PERCENT, batteryShowPercent);
-            mStatusBarBatteryShowPercent.setSummary(
-                    mStatusBarBatteryShowPercent.getEntries()[index]);
+        if (preference == mBatteryStyle) {
+            int value = Integer.parseInt((String) newValue);
+            int batterypercent = Settings.System.getIntForUser(getContentResolver(),
+                    Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0, UserHandle.USER_CURRENT);
+            mBatteryPercent.setEnabled(
+                    value != BATTERY_STYLE_TEXT && value != BATTERY_STYLE_HIDDEN);
+            mBatteryTextCharging.setEnabled(value == BATTERY_STYLE_HIDDEN ||
+                    (value != BATTERY_STYLE_TEXT && batterypercent != 2));
             return true;
-        } else if (preference == mStatusBarBattery) {
-            int batteryStyle = Integer.valueOf((String) newValue);
-            int index = mStatusBarBattery.findIndexOfValue((String) newValue);
-            Settings.Secure.putInt(resolver,
-                    Settings.Secure.STATUS_BAR_BATTERY_STYLE, batteryStyle);
-            mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]);
-            enableStatusBarBatteryDependents(batteryStyle);
+        } else if (preference == mBatteryPercent) {
+            int value = Integer.parseInt((String) newValue);
+            int batterystyle = Settings.System.getIntForUser(getContentResolver(),
+                    Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_PORTRAIT, UserHandle.USER_CURRENT);
+            mBatteryTextCharging.setEnabled(batterystyle == BATTERY_STYLE_HIDDEN ||
+                    (batterystyle != BATTERY_STYLE_TEXT && value != 2));
             return true;
         }
         return false;
     }
 
-    private void enableStatusBarBatteryDependents(int batteryIconStyle) {
-        if (batteryIconStyle == STATUS_BAR_BATTERY_STYLE_TEXT) {
-            mStatusBarBatteryShowPercent.setEnabled(false);
-        } else {
-            mStatusBarBatteryShowPercent.setEnabled(true);
-        }
+    public static void reset(Context mContext) {
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putIntForUser(resolver,
+                Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_PORTRAIT, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.STATUS_BAR_BATTERY_TEXT_CHARGING, 1, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.QS_BATTERY_STYLE, -1, UserHandle.USER_CURRENT);
+        Settings.System.putIntForUser(resolver,
+                Settings.System.QS_SHOW_BATTERY_PERCENT, 2, UserHandle.USER_CURRENT);
     }
-}
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
+    }
+}

src/com/cherish/settings/fragments/StatusBarSettings.java

@@ -27,7 +27,6 @@ import android.view.View;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.cherish.settings.preferences.CustomSeekBarPreference;
-import com.cherish.settings.preferences.SecureSettingSwitchPreference;
 import com.cherish.settings.preferences.SystemSettingSeekBarPreference;
 import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.SystemSettingSwitchPreference;
@@ -48,72 +47,20 @@ import java.util.Collections;
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class StatusBarSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-
-    private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
-    private static final String CONFIG_RESOURCE_NAME = "flag_combined_status_bar_signal_icons";
-    private static final String COBINED_STATUSBAR_ICONS = "show_combined_status_bar_signal_icons";
-	private static final String STATUS_BAR_CLOCK_STYLE = "status_bar_clock";
-
-    private SecureSettingSwitchPreference mCombinedIcons;
-	private SystemSettingListPreference mStatusBarClock;
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.cherish_settings_statusbar);
 		
-	PreferenceScreen prefSet = getPreferenceScreen();
-	final Context mContext = getActivity().getApplicationContext();
-        final ContentResolver resolver = getActivity().getContentResolver();
+		ContentResolver resolver = getActivity().getContentResolver();
 
-        mCombinedIcons = (SecureSettingSwitchPreference)
-                findPreference(COBINED_STATUSBAR_ICONS);
-        Resources sysUIRes = null;
-        boolean def = false;
-        int resId = 0;
-        try {
-            sysUIRes = getActivity().getPackageManager()
-                    .getResourcesForApplication(SYSTEMUI_PACKAGE);
-        } catch (Exception ignored) {
-            // If you don't have system UI you have bigger issues
-        }
-        if (sysUIRes != null) {
-            resId = sysUIRes.getIdentifier(
-                    CONFIG_RESOURCE_NAME, "bool", SYSTEMUI_PACKAGE);
-            if (resId != 0) def = sysUIRes.getBoolean(resId);
-        }
-        boolean enabled = Settings.Secure.getInt(resolver,
-                COBINED_STATUSBAR_ICONS, def ? 1 : 0) == 1;
-        mCombinedIcons.setChecked(enabled);
-        mCombinedIcons.setOnPreferenceChangeListener(this);
-		
-		mStatusBarClock =
-                (SystemSettingListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);
-
-        // Adjust status bar preferences for RTL
-        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
-            if (CherishUtils.hasNotch(mContext)) {
-                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch_rtl);
-                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch_rtl);
-            } else {
-                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_rtl);
-                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_rtl);
-            }
-        } else if (CherishUtils.hasNotch(mContext)) {
-            mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch);
-            mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);
-        }
+        PreferenceScreen prefSet = getPreferenceScreen();
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mCombinedIcons) {
-            boolean enabled = (boolean) objValue;
-            Settings.Secure.putInt(resolver,
-                    COBINED_STATUSBAR_ICONS, enabled ? 1 : 0);
-            return true;
-            }
         return false;
     }
 	

src/com/cherish/settings/fragments/ThemeSettings.java

@@ -2,6 +2,7 @@ package com.cherish.settings.fragments;
 
 import com.android.internal.logging.nano.MetricsProto;
 import static android.os.UserHandle.USER_SYSTEM;
+import static android.os.UserHandle.USER_CURRENT;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -59,7 +60,9 @@ import android.provider.SearchIndexableResource;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Objects;
-
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
 import com.android.internal.util.cherish.CherishUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.cherish.settings.preferences.SystemSettingListPreference;
@@ -68,19 +71,24 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ThemeSettings extends DashboardFragment implements OnPreferenceChangeListener {
-			
-	public static final String TAG = "ThemeSettings";
-	private static final String ALT_SETTINGS_LAYOUT = "alt_settings_layout";
+
+    private static final String ALT_SETTINGS_LAYOUT = "alt_settings_layout";
     private static final String SETTINGS_DASHBOARD_STYLE = "settings_dashboard_style";
     private static final String USE_STOCK_LAYOUT = "use_stock_layout";
     private static final String DISABLE_USERCARD = "disable_usercard";
+	private static final String QS_PANEL_STYLE  = "qs_panel_style";
+			
+	public static final String TAG = "ThemeSettings";
     static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
 	static final int DEFAULT = 0xff1a73e8;
 	private Context mContext;
 
+    private Handler mHandler;
+    private IOverlayManager mOverlayManager;
     private IOverlayManager mOverlayService;
+    private SystemSettingListPreference mQsStyle;
     private UiModeManager mUiModeManager;
-	private SystemSettingListPreference mSettingsDashBoardStyle;
+    private SystemSettingListPreference mSettingsDashBoardStyle;
     private SystemSettingSwitchPreference mAltSettingsLayout;
     private SystemSettingSwitchPreference mUseStockLayout;
     private SystemSettingSwitchPreference mDisableUserCard; 
@@ -113,10 +121,10 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
-		final Resources res = getResources();
-		mContext =  getActivity();
-		
-		mSettingsDashBoardStyle = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_STYLE);
+	final Resources res = getResources();
+	mContext =  getActivity();
+
+        mSettingsDashBoardStyle = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_STYLE);
         mSettingsDashBoardStyle.setOnPreferenceChangeListener(this);
         mAltSettingsLayout = (SystemSettingSwitchPreference) findPreference(ALT_SETTINGS_LAYOUT);
         mAltSettingsLayout.setOnPreferenceChangeListener(this);
@@ -124,16 +132,45 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
         mUseStockLayout.setOnPreferenceChangeListener(this);
         mDisableUserCard = (SystemSettingSwitchPreference) findPreference(DISABLE_USERCARD);
         mDisableUserCard.setOnPreferenceChangeListener(this);
+		
+		mOverlayService = IOverlayManager.Stub
+        .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
+
+        mQsStyle = (SystemSettingListPreference) findPreference(QS_PANEL_STYLE);
+        mCustomSettingsObserver.observe();
         }
 
     public boolean isAvailable() {
         return true;
     }
 	
+	private CustomSettingsObserver mCustomSettingsObserver = new CustomSettingsObserver(mHandler);
+    private class CustomSettingsObserver extends ContentObserver {
+
+        CustomSettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            Context mContext = getContext();
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.QS_PANEL_STYLE),
+                    false, this, UserHandle.USER_ALL);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (uri.equals(Settings.System.getUriFor(Settings.System.QS_PANEL_STYLE))) {
+                updateQsStyle();
+            }
+        }
+    }
+	
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-	  if (preference == mSettingsDashBoardStyle) {
+        if (preference == mSettingsDashBoardStyle) {
             CherishUtils.showSettingsRestartDialog(getContext());
             return true;
         } else if (preference == mAltSettingsLayout) {
@@ -145,9 +182,59 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
         } else if (preference == mDisableUserCard) {
             CherishUtils.showSettingsRestartDialog(getContext());
             return true;
-		}
+		} else if (preference == mQsStyle) {
+            mCustomSettingsObserver.observe();
+            return true;
+        }
         return false;
     }
+	
+	private void updateQsStyle() {
+        ContentResolver resolver = getActivity().getContentResolver();
+
+        int qsPanelStyle = Settings.System.getIntForUser(getContext().getContentResolver(),
+                Settings.System.QS_PANEL_STYLE , 0, UserHandle.USER_CURRENT);
+
+        if (qsPanelStyle == 0) {
+            setDefaultStyle(mOverlayService);
+        } else if (qsPanelStyle == 1) {
+            setQsStyle(mOverlayService, "com.android.system.qs.outline");
+        } else if (qsPanelStyle == 2 || qsPanelStyle == 3) {
+            setQsStyle(mOverlayService, "com.android.system.qs.twotoneaccent");
+        }
+    }
+
+    public static void setDefaultStyle(IOverlayManager overlayManager) {
+        for (int i = 0; i < QS_STYLES.length; i++) {
+            String qsStyles = QS_STYLES[i];
+            try {
+                overlayManager.setEnabled(qsStyles, false, USER_SYSTEM);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void setQsStyle(IOverlayManager overlayManager, String overlayName) {
+        try {
+            for (int i = 0; i < QS_STYLES.length; i++) {
+                String qsStyles = QS_STYLES[i];
+                try {
+                    overlayManager.setEnabled(qsStyles, false, USER_SYSTEM);
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                }
+            }
+            overlayManager.setEnabled(overlayName, true, USER_SYSTEM);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static final String[] QS_STYLES = {
+        "com.android.system.qs.outline",
+        "com.android.system.qs.twotoneaccent"
+    };
 
     @Override
     public int getMetricsCategory() {

src/com/cherish/settings/fragments/Traffic.java

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2021-2022 The PixelDust 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.
- */
-
-package com.cherish.settings.fragments;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.cherish.settings.preferences.CustomSeekBarPreference;
-
-public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
-
-    private CustomSeekBarPreference mNetTrafficSize;
-    private CustomSeekBarPreference mNetTrafficAutohideThreshold;
-    private CustomSeekBarPreference mNetTrafficRefreshInterval;
-    private ListPreference mNetTrafficLocation;
-    private ListPreference mNetTrafficMode;
-    private ListPreference mNetTrafficUnits;
-    private SwitchPreference mNetTrafficAutohide;
-    private SwitchPreference mNetTrafficHideArrow;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.cherish_settings_traffic);
-        final ContentResolver resolver = getActivity().getContentResolver();
-
-        mNetTrafficSize = (CustomSeekBarPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_FONT_SIZE);
-        mNetTrafficAutohideThreshold = (CustomSeekBarPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD);
-        mNetTrafficRefreshInterval = (CustomSeekBarPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_REFRESH_INTERVAL);
-        mNetTrafficLocation = (ListPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_LOCATION);
-        mNetTrafficLocation.setOnPreferenceChangeListener(this);
-        mNetTrafficMode = (ListPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_MODE);
-        mNetTrafficAutohide = (SwitchPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_AUTOHIDE);
-        mNetTrafficUnits = (ListPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_UNITS);
-        mNetTrafficHideArrow = (SwitchPreference)
-                findPreference(Settings.System.NETWORK_TRAFFIC_HIDEARROW);
-
-        int location = Settings.System.getIntForUser(resolver,
-                Settings.System.NETWORK_TRAFFIC_LOCATION, 0, UserHandle.USER_CURRENT);
-        updateEnabledStates(location);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mNetTrafficLocation) {
-            int location = Integer.valueOf((String) newValue);
-            updateEnabledStates(location);
-            return true;
-        }
-        return false;
-    }
-
-    private void updateEnabledStates(int location) {
-        final boolean enabled = location != 0;
-        mNetTrafficSize.setEnabled(enabled);
-        mNetTrafficMode.setEnabled(enabled);
-        mNetTrafficAutohide.setEnabled(enabled);
-        mNetTrafficAutohideThreshold.setEnabled(enabled);
-        mNetTrafficHideArrow.setEnabled(enabled);
-        mNetTrafficRefreshInterval.setEnabled(enabled);
-        mNetTrafficUnits.setEnabled(enabled);
-    }
-}

src/com/cherish/settings/fragments/Udfps.java

@@ -1,74 +1,72 @@
 /*
- * Copyright (C) 2020-22 The CherishOS Projects
+ * Copyright (C) 2019-2022 The CherishOS Projects
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
+ * 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
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *      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.
  */
-
 package com.cherish.settings.fragments;
 
-import com.android.internal.logging.nano.MetricsProto;
-
 import android.app.Activity;
-import android.content.Context;
-import android.content.ContentResolver;
-import android.app.WallpaperManager;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.hardware.fingerprint.FingerprintManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.UserHandle;
+import android.os.ParcelFileDescriptor;
+import com.cherish.settings.fragments.UdfpsIconPicker;
+import android.text.TextUtils;
+import android.app.WallpaperManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.hardware.fingerprint.FingerprintManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.os.ParcelFileDescriptor;
+import android.provider.Settings;
+
 import androidx.preference.ListPreference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragment;
 import androidx.preference.PreferenceManager;
-import androidx.preference.SwitchPreference;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import android.provider.Settings;
-import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.android.internal.util.cherish.fod.FodUtils;
+import androidx.preference.SwitchPreference;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.util.cherish.CherishUtils;
 
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
-import com.cherish.settings.fragments.UdfpsIconPicker;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
 
 import java.io.FileDescriptor;
 import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
-public class UdfpsSettings extends SettingsPreferenceFragment implements
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class Udfps extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
+    private static final String UDFPS_CUSTOMIZATION = "udfps_customization";
     private static final String CUSTOM_FOD_ICON_KEY = "custom_fp_icon_enabled";
     private static final String CUSTOM_FP_FILE_SELECT = "custom_fp_file_select";
     private static final int REQUEST_PICK_IMAGE = 0;
 
+    private PreferenceCategory mUdfpsCustomization;
     private Preference mCustomFPImage;
     private SystemSettingSwitchPreference mCustomFodIcon;
     private Preference mUdfpsIconPicker;
@@ -78,15 +76,16 @@ public class UdfpsSettings extends SettingsPreferenceFragment implements
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.cherish_settings_udfps);
 
-        final PreferenceScreen prefScreen = getPreferenceScreen();
+        final PreferenceScreen prefSet = getPreferenceScreen();
         Resources resources = getResources();
 
-        /**
-        boolean udfpsResPkgInstalled = CherishUtils.isPackageInstalled(getContext(),
+        final boolean udfpsResPkgInstalled = CherishUtils.isPackageInstalled(getContext(),
                 "com.cherish.udfps.resources");
-		PreferenceCategory udfps_custom = (PreferenceCategory) prefScreen.findPreference("udfps_customization");*/
-
-        mUdfpsIconPicker = (Preference) prefScreen.findPreference("udfps_icon_picker");
+	mUdfpsCustomization = (PreferenceCategory) findPreference(UDFPS_CUSTOMIZATION);
+        if (!udfpsResPkgInstalled) {
+            prefSet.removePreference(mUdfpsCustomization);
+        }
+       mUdfpsIconPicker = (Preference) prefSet.findPreference("udfps_icon_picker");
 
         mCustomFPImage = findPreference(CUSTOM_FP_FILE_SELECT);
         final String customIconURI = Settings.System.getString(getContext().getContentResolver(),
@@ -106,19 +105,9 @@ public class UdfpsSettings extends SettingsPreferenceFragment implements
         }
     }
 
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference == mCustomFPImage) {
-            Intent intent = new Intent(Intent.ACTION_PICK);
-            intent.setType("image/*");
-            startActivityForResult(intent, REQUEST_PICK_IMAGE);
-            return true;
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
+        ContentResolver resolver = getActivity().getContentResolver();
         if (preference == mCustomFodIcon) {
             boolean val = (Boolean) newValue;
             Settings.System.putIntForUser(getActivity().getContentResolver(),
@@ -134,6 +123,17 @@ public class UdfpsSettings extends SettingsPreferenceFragment implements
         return false;
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference == mCustomFPImage) {
+            Intent intent = new Intent(Intent.ACTION_PICK);
+            intent.setType("image/*");
+            startActivityForResult(intent, REQUEST_PICK_IMAGE);
+            return true;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent result) {
        if (requestCode == REQUEST_PICK_IMAGE && resultCode == Activity.RESULT_OK) {
@@ -167,5 +167,10 @@ public class UdfpsSettings extends SettingsPreferenceFragment implements
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
-}
 
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_udfps);
+}

src/com/cherish/settings/fragments/UdfpsAnimation.java

@@ -13,61 +13,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.cherish.settings.fragments;
 
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Gravity;
+import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.FrameLayout;
+import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.text.TextUtils;
-import androidx.preference.PreferenceViewHolder;
-import android.view.ViewGroup.LayoutParams;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
-import android.net.Uri;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.widget.Switch;
-import com.android.settings.SettingsActivity;
-import com.android.settings.widget.SettingsMainSwitchBar;
-import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 import com.bumptech.glide.Glide;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 public class UdfpsAnimation extends SettingsPreferenceFragment implements
         OnMainSwitchChangeListener {
@@ -85,6 +83,7 @@ public class UdfpsAnimation extends SettingsPreferenceFragment implements
     private String[] mTitles;
 
     private boolean mEnabled;
+    private UdfpsAnimAdapter mUdfpsAnimAdapter;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -119,8 +118,7 @@ public class UdfpsAnimation extends SettingsPreferenceFragment implements
         mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 3);
         mRecyclerView.setLayoutManager(gridLayoutManager);
-        UdfpsAnimAdapter mUdfpsAnimAdapter = new UdfpsAnimAdapter(getActivity());
-        mRecyclerView.setAdapter(mUdfpsAnimAdapter);
+        mUdfpsAnimAdapter = new UdfpsAnimAdapter(getActivity());
 
         return view;
     }
@@ -144,15 +142,15 @@ public class UdfpsAnimation extends SettingsPreferenceFragment implements
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         Settings.System.putInt(getActivity().getContentResolver(),
                 Settings.System.UDFPS_ANIM, isChecked ? 1 : 0);
+        mSwitch.setChecked(isChecked);
         setEnabled(isChecked);
     }
 
     public void setEnabled(boolean enabled) {
-        for (int i = 0; i < mRecyclerView.getChildCount(); ++i) {
-            RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(mRecyclerView.getChildAt(i));
-            holder.itemView.setEnabled(enabled);
-            holder.itemView.findViewById(R.id.option_thumbnail).setAlpha(enabled ? 1f : 0.5f);
-            holder.itemView.findViewById(R.id.option_label).setAlpha(enabled ? 1f : 0.5f);
+        if (enabled) {
+            mRecyclerView.setAdapter(mUdfpsAnimAdapter);
+        } else {
+            mRecyclerView.setAdapter(null);
         }
     }
 
@@ -216,10 +214,6 @@ public class UdfpsAnimation extends SettingsPreferenceFragment implements
                             Settings.System.UDFPS_ANIM_STYLE, position);
                 }
             });
-
-            holder.itemView.setEnabled(mEnabled);
-            holder.itemView.findViewById(R.id.option_thumbnail).setAlpha(mEnabled ? 1f : 0.5f);
-            holder.itemView.findViewById(R.id.option_label).setAlpha(mEnabled ? 1f : 0.5f);
         }
 
         @Override
@@ -260,5 +254,4 @@ public class UdfpsAnimation extends SettingsPreferenceFragment implements
         }
         return null;
     }
-
 }

src/com/cherish/settings/fragments/UdfpsIconPicker.java

@@ -13,56 +13,55 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.cherish.settings.fragments;
 
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.net.Uri;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Gravity;
+import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.text.TextUtils;
-import androidx.preference.PreferenceViewHolder;
-import android.view.ViewGroup.LayoutParams;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
-import android.net.Uri;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
-import com.android.settings.SettingsPreferenceFragment;
 
 import com.bumptech.glide.Glide;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
-import org.json.JSONObject;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 public class UdfpsIconPicker extends SettingsPreferenceFragment {
 

src/com/cherish/settings/fragments/UdfpsPressedIconPicker.java

@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2021 AospExtended ROM 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.
+ */
+package com.cherish.settings.fragments;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.net.Uri;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class UdfpsPressedIconPicker extends SettingsPreferenceFragment {
+
+    private RecyclerView mRecyclerView;
+
+    private Resources udfpsRes;
+
+    private String mPkg = "com.cherish.udfps.resources";
+
+    private String[] mIcons;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.udfps_pressed_color_title);
+
+        loadResources();
+    }
+
+    private void loadResources() {
+        try {
+            PackageManager pm = getActivity().getPackageManager();
+            udfpsRes = pm.getResourcesForApplication(mPkg);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        mIcons = udfpsRes.getStringArray(udfpsRes.getIdentifier("udfps_pressedicons",
+                "array", mPkg));
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(
+                R.layout.item_view, container, false);
+
+        mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 3);
+        mRecyclerView.setLayoutManager(gridLayoutManager);
+        UdfpsPressedIconAdapter mUdfpsPressedIconAdapter = new UdfpsPressedIconAdapter(getActivity());
+        mRecyclerView.setAdapter(mUdfpsPressedIconAdapter);
+
+        return view;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CHERISH_SETTINGS;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    public class UdfpsPressedIconAdapter extends RecyclerView.Adapter<UdfpsPressedIconAdapter.UdfpsPressedIconViewHolder> {
+        Context context;
+        String mSelectedIcon;
+        String mAppliedIcon;
+
+        public UdfpsPressedIconAdapter(Context context) {
+            this.context = context;
+        }
+
+        @Override
+        public UdfpsPressedIconViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_option, parent, false);
+            UdfpsPressedIconViewHolder vh = new UdfpsPressedIconViewHolder(v);
+            return vh;
+        }
+
+        @Override
+        public void onBindViewHolder(UdfpsPressedIconViewHolder holder, final int position) {
+            String iconRes = mIcons[position];
+
+            Glide.with(holder.image.getContext())
+                    .load("")
+                    .placeholder(getDrawable(holder.image.getContext(), mIcons[position]))
+                    .into(holder.image);
+
+            holder.image.setPadding(20,20,20,20);
+
+            holder.name.setVisibility(View.GONE);
+
+            if (position == Settings.System.getInt(context.getContentResolver(),
+                Settings.System.UDFPS_COLOR, 0)) {
+                mAppliedIcon = iconRes;
+                if (mSelectedIcon == null) {
+                    mSelectedIcon = iconRes;
+                }
+            }
+            holder.itemView.setActivated(iconRes == mSelectedIcon);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    updateActivatedStatus(mSelectedIcon, false);
+                    updateActivatedStatus(iconRes, true);
+                    mSelectedIcon = iconRes;
+                    Settings.System.putInt(getActivity().getContentResolver(),
+                            Settings.System.UDFPS_COLOR, position);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return mIcons.length;
+        }
+
+        public class UdfpsPressedIconViewHolder extends RecyclerView.ViewHolder {
+            TextView name;
+            ImageView image;
+            public UdfpsPressedIconViewHolder(View itemView) {
+                super(itemView);
+                name = (TextView) itemView.findViewById(R.id.option_label);
+                image = (ImageView) itemView.findViewById(R.id.option_thumbnail);
+            }
+        }
+
+        private void updateActivatedStatus(String icon, boolean isActivated) {
+            int index = Arrays.asList(mIcons).indexOf(icon);
+            if (index < 0) {
+                return;
+            }
+            RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(index);
+            if (holder != null && holder.itemView != null) {
+                holder.itemView.setActivated(isActivated);
+            }
+        }
+    }
+
+    public Drawable getDrawable(Context context, String drawableName) {
+        try {
+            PackageManager pm = context.getPackageManager();
+            Resources res = pm.getResourcesForApplication(mPkg);
+            Context ctx = context.createPackageContext(
+                    mPkg, Context.CONTEXT_IGNORE_SECURITY);
+            return ctx.getDrawable(res.getIdentifier(drawableName, "drawable", mPkg));
+        }
+        catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

src/com/cherish/settings/fragments/VolumeRockerSettings.java

@@ -1,67 +1,194 @@
 package com.cherish.settings.fragments;
 
-import com.android.internal.logging.nano.MetricsProto;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.media.AudioManager;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
-import android.preference.SwitchPreference;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceFragment;
 
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settingslib.search.SearchIndexable;
-import android.provider.SearchIndexableResource;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class VolumeRockerSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    private static final String TAG = "VolumeSteps";
+    private static final String VOLUME_STEP_DEFAULTS = "volume_step_defaults";
+    private static final String FIRST_RUN_KEY = "first_run";
 
+    // base map of all preference keys and the associated stream
+    private static final Map<String, Integer> volume_map = new HashMap<String, Integer>();
+    static {
+        volume_map.put("volume_steps_alarm", new Integer(AudioManager.STREAM_ALARM));
+        volume_map.put("volume_steps_dtmf", new Integer(AudioManager.STREAM_DTMF));
+        volume_map.put("volume_steps_music", new Integer(AudioManager.STREAM_MUSIC));
+        volume_map.put("volume_steps_notification", new Integer(AudioManager.STREAM_NOTIFICATION));
+        volume_map.put("volume_steps_ring", new Integer(AudioManager.STREAM_RING));
+        volume_map.put("volume_steps_system", new Integer(AudioManager.STREAM_SYSTEM));
+        volume_map.put("volume_steps_voice_call", new Integer(AudioManager.STREAM_VOICE_CALL));
+    }
+
+    // entries to remove on non-telephony devices
+    private static final Set<String> telephony_set = new HashSet<String>();
+    static {
+        telephony_set.add("volume_steps_dtmf");
+        telephony_set.add("volume_steps_ring");
+        telephony_set.add("volume_steps_voice_call");
+    }
+
+    // set of available pref keys after device configuration filter
+    private Set<String> mAvailableKeys = new HashSet<String>();
+    private AudioManager mAudioManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.cherish_settings_volume);
+        mAudioManager = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
+
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+        mAvailableKeys = volume_map.keySet();
+
+        // remove invalid audio stream prefs
+        boolean isPhone = TelephonyManager.getDefault().getCurrentPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
+
+        if (!isPhone) {
+            // remove telephony keys from available set
+            mAvailableKeys.removeAll(telephony_set);
+            for (String key : telephony_set) {
+                Preference toRemove = prefScreen.findPreference(key);
+                if (toRemove != null) {
+                    prefScreen.removePreference(toRemove);
+                }
+            }
+        }
+
+        // check prefs for initial run of this fragment
+        final boolean firstRun = checkForFirstRun();
+
+        // entries array isn't translatable ugh
+        final String defEntry = getString(R.string.volume_steps_reset);
+
+        // initialize prefs: set defaults if first run, set listeners and update values
+        for (String key : mAvailableKeys) {
+            Preference pref = prefScreen.findPreference(key);
+            if (pref == null || !(pref instanceof ListPreference)) {
+                continue;
+            }
+            final ListPreference listPref = (ListPreference) pref;
+            int steps = mAudioManager.getStreamMaxVolume(volume_map.get(key));
+            if (firstRun) {
+                saveDefaultSteps(listPref, steps);
+            }
+            final int defSteps = getDefaultSteps(listPref);
+            CharSequence[] entries = new CharSequence[listPref.getEntries().length + 1];
+            CharSequence[] values = new CharSequence[listPref.getEntryValues().length + 1];
+
+            for (int i = 0; i < entries.length; i++) {
+                if (i == 0) {
+                    entries[i] = defEntry;
+                    values[i] = String.valueOf(defSteps);
+                    continue;
+                }
+                entries[i] = listPref.getEntries()[i - 1];
+                values[i] = listPref.getEntryValues()[i - 1];
+            }
+            listPref.setEntries(entries);
+            listPref.setEntryValues(values);
+            updateVolumeStepPrefs(listPref, steps);
+            listPref.setOnPreferenceChangeListener(this);
+        }
     }
 
     @Override
-    public boolean onPreferenceChange(Preference preference, Object value) {
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        if (preference.hasKey() && mAvailableKeys.contains(preference.getKey())) {
+            commitVolumeSteps(preference, Integer.parseInt(objValue.toString()));
+        }
+        return true;
+    }
+
+    private SharedPreferences getDefaultStepsPrefs() {
+        return getActivity().getSharedPreferences(VOLUME_STEP_DEFAULTS,
+                Context.MODE_PRIVATE);
+    }
+
+    // test for initial run of this fragment
+    private boolean checkForFirstRun() {
+        String isFirstRun = getDefaultStepsPrefs().getString(FIRST_RUN_KEY, null);
+        if (isFirstRun == null) {
+            getDefaultStepsPrefs().edit().putString(FIRST_RUN_KEY, "first_run_initialized").commit();
+            return true;
+        }
         return false;
     }
 
+    private int getDefaultSteps(Preference pref) {
+        if (pref == null || !(pref instanceof ListPreference)) {
+            // unlikely
+            return -1;
+        }
+        String key = pref.getKey();
+        String value = getDefaultStepsPrefs().getString(key, null);
+        if (value == null) {
+            // unlikely
+            return -1;
+        }
+        return Integer.parseInt(value);
+    }
+
+    // on the initial run, let's store true device defaults in sharedPrefs
+    private void saveDefaultSteps(Preference volPref, int defaultSteps) {
+        String key = volPref.getKey();
+        getDefaultStepsPrefs().edit().putString(key, String.valueOf(defaultSteps)).commit();
+    }
+
+    private void updateVolumeStepPrefs(Preference pref, int steps) {
+        if (pref == null || !(pref instanceof ListPreference)) {
+            return;
+        }
+        final ListPreference listPref = (ListPreference) pref;
+        listPref.setSummary(String.valueOf(steps));
+        listPref.setValue(String.valueOf(steps));
+    }
+
+    private void commitVolumeSteps(Preference pref, int steps) {
+        Settings.System.putInt(getActivity().getContentResolver(), pref.getKey(), steps);
+        mAudioManager.setStreamMaxVolume(volume_map.get(pref.getKey()), steps);
+        updateVolumeStepPrefs(pref, steps);
+        Log.i(TAG, "Volume steps:" + pref.getKey() + "" + String.valueOf(steps));
+    }
+
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
+        return MetricsEvent.CHERISH_SETTINGS;
     }
-	
-	/**
+
+    /**
      * For Search.
      */
-
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    ArrayList<SearchIndexableResource> result =
-                            new ArrayList<SearchIndexableResource>();
-                    SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.cherish_settings_volume;
-                    result.add(sir);
-                    return result;
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = super.getNonIndexableKeys(context);
-                    return keys;
-                }
-    };
-}
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_volume);
+}