| commit | 4ad4f35f7883445a464c4d0c1272effca4bdd080 | [log] [tgz] |
|---|---|---|
| author | Jacky Wang <jiannan@google.com> | Tue Oct 29 20:44:29 2024 +0800 |
| committer | Jacky Wang <jiannan@google.com> | Tue Oct 29 20:51:51 2024 +0800 |
| tree | 401f58872cb129224c9458fd05ea50ae72766197 | |
| parent | 0478218dad380d7c62e8d9a83ac3be854b13dbe6 [diff] |
[Catalyst] Specify order in hierarchy NO_IFTTT=Update preference order Bug: 332201912 Flag: EXEMPT refactor Test: Manual Change-Id: Iae99e699d852229779ea41a1cbc92bba47684a7b
diff --git a/src/com/android/settings/datausage/DataSaverScreen.kt b/src/com/android/settings/datausage/DataSaverScreen.kt index 171f002..eafaa1e 100644 --- a/src/com/android/settings/datausage/DataSaverScreen.kt +++ b/src/com/android/settings/datausage/DataSaverScreen.kt
@@ -34,8 +34,6 @@ 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 9b593ad..0126e13 100644 --- a/src/com/android/settings/notification/CallVolumePreference.kt +++ b/src/com/android/settings/notification/CallVolumePreference.kt
@@ -52,8 +52,6 @@ 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 f29437b..e36576d 100644 --- a/src/com/android/settings/notification/SoundScreen.kt +++ b/src/com/android/settings/notification/SoundScreen.kt
@@ -49,8 +49,8 @@ override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) { - +CallVolumePreference() - +DialPadTonePreference() + +CallVolumePreference() order -170 + +DialPadTonePreference() order -50 } companion object {