From 8ac1c2ea3abc885465398b51510dc3e401255873 Mon Sep 17 00:00:00 2001 From: Pranav Vashi Date: Sat, 25 Nov 2023 10:37:17 +0530 Subject: [PATCH] Settings: Import settings from pixel-fw mnri: Updated for u qpr2 Signed-off-by: Pranav Vashi Signed-off-by: minaripenguin Signed-off-by: Alvin Francis Signed-off-by: Pranav Vashi --- Android.bp | 1 + SettingsGoogle | 1 + res/xml/about_legal.xml | 6 ++++ ...ssibility_vibration_intensity_settings.xml | 8 ++++++ res/xml/battery_saver_settings.xml | 17 ++++++++++- res/xml/display_settings.xml | 7 +++++ res/xml/gesture_navigation_settings.xml | 13 +++++++++ res/xml/mobile_network_settings.xml | 5 ++++ res/xml/network_provider_calls_sms.xml | 28 +++++++++++++++++++ res/xml/power_usage_summary.xml | 23 +++++++++++---- res/xml/security_lockscreen_settings.xml | 6 ++++ res/xml/smart_battery_detail.xml | 18 ++++++++---- res/xml/sound_settings.xml | 10 ++++++- res/xml/spatial_audio_settings.xml | 6 ++++ res/xml/special_access.xml | 6 ++++ res/xml/vpn_settings2.xml | 8 ++++++ 16 files changed, 151 insertions(+), 12 deletions(-) create mode 120000 SettingsGoogle diff --git a/Android.bp b/Android.bp index dedddb427be..f3725844e00 100644 --- a/Android.bp +++ b/Android.bp @@ -70,6 +70,7 @@ android_library { "res-export", // for external usage "res-product", "Evolver/res", + "SettingsGoogle/res", ], static_libs: [ // External dependencies diff --git a/SettingsGoogle b/SettingsGoogle new file mode 120000 index 00000000000..f02870c6106 --- /dev/null +++ b/SettingsGoogle @@ -0,0 +1 @@ +../../../vendor/pixel-framework/SettingsGoogle \ No newline at end of file diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml index 37b7d904ab7..b8e12a6313b 100644 --- a/res/xml/about_legal.xml +++ b/res/xml/about_legal.xml @@ -60,6 +60,12 @@ android:title="@string/webview_license_title" settings:controller="com.android.settings.deviceinfo.legal.WebViewLicensePreferenceController" /> + + + + + + + + + + + + settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverScheduleAndRemindersSettings"/> + + + + + + diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 463735afa98..c1ffbf1cf9d 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -261,6 +261,13 @@ android:defaultValue="false" settings:requiresFeature="lineagehardware:FEATURE_HIGH_TOUCH_POLLING_RATE" /> + + + + + + + + + + + + + + + + + + diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index 9b345c2874d..7771e30b715 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -37,7 +37,11 @@ android:key="battery_help_message" android:layout="@layout/preference_battery_error" android:selectable="false" - settings:searchable="false" /> + settings:searchable="false"> + + + android:title="@string/adaptive_charging_title" + android:fragment="com.android.settings.fuelgauge.SmartBatterySettings" + settings:keywords="@string/keywords_battery_adaptive_preferences" + settings:searchable="true" + settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingPreferenceController" /> + + diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml index d1eba3f307b..e34b2beb8e6 100644 --- a/res/xml/security_lockscreen_settings.xml +++ b/res/xml/security_lockscreen_settings.xml @@ -89,6 +89,12 @@ android:title="@string/lockscreen_double_line_clock_setting_toggle" android:summary="@string/lockscreen_double_line_clock_summary" settings:controller="com.android.settings.display.LockscreenClockPreferenceController" /> + + + android:selectable="false" + settings:lottie_rawRes="@raw/lottie_adaptive_battery" + settings:searchable="false" /> + + + android:key="adaptive_charging_footer_preference" + android:title="@string/adaptive_charging_footer" + settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingFooterPreferenceController" + settings:searchable="false" /> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index aad54b62f61..dcd005b6c4f 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -174,7 +174,15 @@ android:title="@string/app_volume_title" android:summary="@string/app_volume_summary" android:defaultValue="false" - android:order="-5"/> + android:order="-58"/> + + + + + + + + +