diff --git a/src/com/android/settings/datausage/DataSaverScreen.kt b/src/com/android/settings/datausage/DataSaverScreen.kt index 171f0025957..eafaa1e8c03 100644 --- a/src/com/android/settings/datausage/DataSaverScreen.kt +++ b/src/com/android/settings/datausage/DataSaverScreen.kt @@ -34,8 +34,6 @@ class DataSaverScreen : PreferenceScreenCreator { override val icon: Int get() = R.drawable.ic_settings_data_usage - override fun order(context: Context) = 10 - override fun isFlagEnabled(context: Context) = Flags.catalystRestrictBackgroundParentEntry() override fun fragmentClass() = DataSaverSummary::class.java diff --git a/src/com/android/settings/notification/CallVolumePreference.kt b/src/com/android/settings/notification/CallVolumePreference.kt index 9b593ad5493..0126e139d44 100644 --- a/src/com/android/settings/notification/CallVolumePreference.kt +++ b/src/com/android/settings/notification/CallVolumePreference.kt @@ -52,8 +52,6 @@ open class CallVolumePreference : override fun getIcon(context: Context) = R.drawable.ic_local_phone_24_lib - override fun order(context: Context) = -170 - override fun isAvailable(context: Context) = context.resources.getBoolean(R.bool.config_show_call_volume) && !createAudioHelper(context).isSingleVolume() diff --git a/src/com/android/settings/notification/SoundScreen.kt b/src/com/android/settings/notification/SoundScreen.kt index f29437b934b..e36576db4f8 100644 --- a/src/com/android/settings/notification/SoundScreen.kt +++ b/src/com/android/settings/notification/SoundScreen.kt @@ -49,8 +49,8 @@ class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider { override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) { - +CallVolumePreference() - +DialPadTonePreference() + +CallVolumePreference() order -170 + +DialPadTonePreference() order -50 } companion object {