diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index d739aaf..933c512 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -10,19 +10,19 @@
 android_library {
     name: "SettingsLib",
     defaults: [
-        "SettingsLintDefaults",
         "SettingsLibAvatarPickerDefaults",
+        "SettingsLintDefaults",
     ],
 
     static_libs: [
         "androidx.localbroadcastmanager_localbroadcastmanager",
         "androidx.room_room-runtime",
         "androidx.sqlite_sqlite",
-        "zxing-core",
         "guava",
+        "zxing-core",
 
-        "WifiTrackerLibRes",
         "//frameworks/libs/systemui:iconloader",
+        "WifiTrackerLibRes",
         "setupdesign",
 
         "SettingsLibActionBarShadow",
@@ -31,8 +31,8 @@
         "SettingsLibAppPreference",
         "SettingsLibBannerMessagePreference",
         "SettingsLibBarChartPreference",
-        "SettingsLibButtonPreference",
         "SettingsLibBulletPreference",
+        "SettingsLibButtonPreference",
         "SettingsLibCardPreference",
         "SettingsLibCollapsingToolbarBaseActivity",
         "SettingsLibDeviceStateRotationLock",
@@ -50,6 +50,7 @@
         "SettingsLibProgressBar",
         "SettingsLibRestrictedLockUtils",
         "SettingsLibSearchWidget",
+        "SettingsLibSegmentedButtonPreference",
         "SettingsLibSelectorWithWidgetPreference",
         "SettingsLibSettingsSpinner",
         "SettingsLibSettingsTransition",
@@ -62,7 +63,7 @@
         "SettingsLibZeroStatePreference",
         "settingslib_media_flags_lib",
     ],
-    libs:[
+    libs: [
         // This flag library has been added in frameworks jar
         "aconfig_settingslib_flags_java_lib",
         "wifi_framework_aconfig_flags_lib",
@@ -118,8 +119,8 @@
         "legacy_avatar_picker_app_enabled",
     ],
     properties: [
-        "static_libs",
         "manifest",
+        "static_libs",
     ],
 }