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" />
 
+    <Preference
+        android:key="legal_source_code"
+        android:summary="@string/legal_source_code_description"
+        android:title="@string/legal_source_code_title"
+        settings:controller="com.google.android.settings.deviceinfo.legal.SourceCodeController" />
+
     <Preference
         android:key="wallpaper_attributions"
         android:title="@string/wallpaper_attributions"
diff --git a/res/xml/accessibility_vibration_intensity_settings.xml b/res/xml/accessibility_vibration_intensity_settings.xml
index 17e9f93b7b9..8ba9ce90f36 100644
--- a/res/xml/accessibility_vibration_intensity_settings.xml
+++ b/res/xml/accessibility_vibration_intensity_settings.xml
@@ -59,6 +59,14 @@
             app:keywords="@string/keywords_alarm_vibration"
             app:controller="com.android.settings.accessibility.AlarmVibrationIntensityPreferenceController" />
 
+        <SwitchPreferenceCompat
+            android:key="adaptive_alert_vibration"
+            android:summary="@string/adaptive_alert_vibration_summary"
+            android:title="@string/adaptive_alert_vibration_title"
+            app:controller="com.google.android.settings.accessibility.AdaptiveHapticsTogglePreferenceController"
+            app:keywords="@string/keywords_adaptive_alert_vibration"
+            app:searchable="@bool/config_adaptive_alert_vibration_enabled" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 74ef85604ba..c0c2a864527 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -26,13 +26,27 @@
         android:title="@string/battery_saver_master_switch_title"
         settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>
 
+    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="battery_saver_entry" android:order="30" settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverModePreferenceController">
+
+        <com.android.settingslib.widget.SelectorWithWidgetPreference android:title="@string/basic_battery_saver_title" android:key="basic_battery_saver_entry" 
+android:summary="@string/basic_battery_saver_summary"/>
+
+        <com.android.settingslib.widget.SelectorWithWidgetPreference android:title="@string/extreme_battery_saver_title" android:key="extreme_battery_saver_entry" android:summary="@string/extreme_battery_saver_summary"/>
+    </PreferenceCategory>
+
     <Preference
         android:order="50"
         android:key="battery_saver_schedule"
         android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings"
         android:title="@string/battery_saver_schedule_settings_title"
         settings:keywords="@string/keywords_battery_saver_schedule"
-        settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverSchedulePreferenceController"/>
+        settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverScheduleAndRemindersSettings"/>
+
+    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="battery_saver_expand_entry" android:order="70" settings:controller="com.google.android.settings.fuelgauge.batterysaver.AdaptiveBatteryExpandController">
+
+        <com.android.settingslib.widget.TopIntroPreference android:title="@string/smart_battery_summary" android:key="adaptive_battery_top_intro" android:order="110" settings:searchable="false"/>
+        <com.android.settingslib.widget.MainSwitchPreference android:title="@string/adaptive_battery_switch_title" android:key="adaptive_battery" android:order="130"/>
+    </PreferenceCategory>
 
     <SwitchPreferenceCompat
         android:order="80"
@@ -46,5 +60,6 @@
         android:order="100"
         android:key="battery_saver_footer_preference"
         android:title="@*android:string/battery_saver_description"
+        settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverFooterPreferenceController"
         settings:searchable="false"/>
 </PreferenceScreen>
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" />
 
+        <SwitchPreferenceCompat
+            android:key="touch_sensitivity"
+            android:title="@string/touch_sensitivity_title"
+            android:summary="@string/touch_sensitivity_summary"
+            settings:controller="com.google.android.settings.touch.TouchSensitivityPreferenceController"
+            settings:keywords="@string/keywords_touch_sensitivity" />
+
         <lineageos.preference.LineageSystemSettingSwitchPreference
             android:key="high_touch_sensitivity_enable"
             android:title="@string/high_touch_sensitivity_title"
diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 040a31b613d..e2b31562f19 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -54,6 +54,19 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="search_gesture_category"
+        android:persistent="false"
+        android:title="@string/search_gesture_category_title"
+        settings:controller="com.google.android.settings.gestures.GestureNavigationSettingsGoogleSearchController">
+        <SwitchPreferenceCompat
+            android:key="search_gesture_press_hold"
+            android:summary="@string/search_press_hold_gesture_summary"
+            android:title="@string/search_press_hold_gesture_title"
+            settings:controller="com.google.android.settings.gestures.GestureNavigationSettingsGoogleSearchController"
+            settings:highlightableMenuKey="@string/menu_key_system" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="back_sensitivity_category"
         android:persistent="false"
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index b0487031c83..72d03bab62c 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -190,6 +190,11 @@
             settings:controller="com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController"
             settings:enableCopying="true"/>
 
+        <Preference
+            android:key="speed_boost_settings"
+            android:title="@string/speed_boost_title"
+            settings:controller="com.google.android.settings.network.telephony.SpeedBoostPreferenceController" />
+
         <!-- IMEI -->
         <Preference
             android:key="network_mode_imei_info"
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
index 7f2ba8ab8c4..448b5671524 100644
--- a/res/xml/network_provider_calls_sms.xml
+++ b/res/xml/network_provider_calls_sms.xml
@@ -45,4 +45,32 @@
         settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController"
         settings:allowDividerAbove="true"
         />
+
+    <PreferenceCategory
+        android:key="connectivity_helper_call_quality_category"
+        android:order="30"
+        android:title="@string/connectivity_helper_call_quality_category"
+        settings:allowDividerAbove="true">
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_connectivity_helper_call_quality"
+            android:key="connectivity_helper_call_quality"
+            android:summary="@string/connectivity_helper_call_quality_summary"
+            android:title="@string/connectivity_helper_call_quality_title"
+            settings:controller="com.google.android.settings.network.ConnectivityHelperCallQualityPreferenceController" />
+
+        <SwitchPreferenceCompat
+            android:key="connectivity_helper_d2d"
+            android:order="40"
+            android:summary="@string/connectivity_helper_d2d_summary"
+            android:title="@string/connectivity_helper_d2d_title"
+            settings:controller="com.google.android.settings.network.ConnectivityHelperDeviceToDevicePreferenceController" />
+
+        <com.android.settingslib.widget.FooterPreference
+            android:key="connectivity_helper_footer"
+            android:selectable="false"
+            android:title="@string/connectivity_helper_footnote"
+            settings:searchable="false" />
+    </PreferenceCategory>
+
 </PreferenceScreen>
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">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:data="https://support.google.com/pixelphone/?p=p4xl_battery" />
+    </com.android.settingslib.widget.LayoutPreference>
 
     <com.android.settings.widget.TipCardPreference
         android:key="battery_tip"
@@ -61,11 +65,20 @@
             settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
 
         <Preference
-            android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
             android:key="smart_battery_manager"
-            android:title="@string/smart_battery_manager_title"
-            settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
-            settings:keywords="@string/keywords_battery_adaptive_preferences" />
+            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" />
+
+        <Preference
+            android:key="reverse_charging"
+            android:title="@string/reverse_charging_title"
+            android:fragment="com.google.android.settings.fuelgauge.reversecharging.ReverseChargingDashboardFragment"
+            settings:keywords="@string/keywords_battery_share_settings"
+            settings:searchable="true"
+            settings:controller="com.google.android.settings.fuelgauge.reversecharging.ReverseChargingPreferenceController" />
     </PreferenceCategory>
 
     <!-- Charging control -->
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" />
+
+        <SwitchPreferenceCompat
+            android:key="lockscreen_show_weather_switch"
+            android:summary="@string/lockscreen_show_weather_summary"
+            android:title="@string/lockscreen_show_weather_title"
+            settings:controller="com.google.android.settings.display.LockscreenWeatherPreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 8fdd3a5995b..c01e02f24fa 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -24,7 +24,15 @@
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="auto_awesome_battery"
-        settings:lottie_rawRes="@raw/auto_awesome_battery_lottie" />
+        android:selectable="false"
+        settings:lottie_rawRes="@raw/lottie_adaptive_battery"
+        settings:searchable="false" />
+
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="adaptive_charging_switch"
+        android:title="@string/adaptive_charging_main_switch_title"
+        settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingMainSwitchPreferenceController"
+        settings:keywords="@string/keywords_adaptive_charging"/>
 
     <SwitchPreferenceCompat
         android:key="smart_battery"
@@ -43,8 +51,8 @@
         android:title="@string/restricted_app_title"/>
 
     <com.android.settingslib.widget.FooterPreference
-        android:key="smart_battery_detail_footer"
-        android:title="@string/smart_battery_footer"
-        android:selectable="false"
-        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" />
 </PreferenceScreen>
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"/>
+
+    <Preference
+        android:key="clear_calling"
+        android:title="@string/clear_calling_title"
+        android:summary="@string/clear_calling_topintro"
+        android:fragment="com.google.android.settings.notification.ClearCallingSettings"
+        settings:controller="com.google.android.settings.notification.ClearCallingPreferenceController"
+        android:order="-55"/>
 
     <!-- Dial pad tones -->
     <SwitchPreferenceCompat
diff --git a/res/xml/spatial_audio_settings.xml b/res/xml/spatial_audio_settings.xml
index 7355f98d376..aa18d7a29f7 100644
--- a/res/xml/spatial_audio_settings.xml
+++ b/res/xml/spatial_audio_settings.xml
@@ -24,6 +24,12 @@
         android:title="@string/spatial_audio_text"
         settings:searchable="false"/>
 
+    <com.android.settingslib.widget.ButtonPreference
+        android:icon="@drawable/ic_lightbulb_tips"
+        android:key="discover_tips"
+        android:title="@string/discover_tips_button"
+        settings:controller="com.google.android.settings.notification.SpatialAudioTipsButtonPreferenceController" />
+
     <SwitchPreferenceCompat
         android:key="spatial_audio"
         android:title="@string/spatial_audio_speaker"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index f3a5f3216c7..4714aa36112 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -46,6 +46,12 @@
         settings:searchable="false"
         settings:controller="com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
 
+    <Preference
+        android:key="debugging_data"
+        android:order="-1650"
+        android:title="@string/debugging_data_title"
+        settings:controller="com.google.android.settings.applications.specialaccess.DebuggingDataPreferenceController" />
+
     <Preference
         android:key="system_alert_window_app_list"
         android:title="@string/system_alert_window_settings"
diff --git a/res/xml/vpn_settings2.xml b/res/xml/vpn_settings2.xml
index 0d374c75518..203deb16331 100644
--- a/res/xml/vpn_settings2.xml
+++ b/res/xml/vpn_settings2.xml
@@ -15,7 +15,15 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/vpn_title">
+
+    <com.android.settingslib.widget.ButtonPreference
+        android:icon="@drawable/ic_lightbulb_tips"
+        android:key="discover_tips"
+        android:title="@string/discover_tips_button"
+        settings:controller="com.google.android.settings.network.VpnSettings2TipsButtonPreferenceController" />
+
     <PreferenceCategory
         android:key="advanced_vpn_group"/>