Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce5ecef8 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Specify order in hierarchy" into main

parents 6e08ff35 4ad4f35f

src/com/android/settings/datausage/DataSaverScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/notification/CallVolumePreference.kt

+0 −2
Original line number Diff line number Diff line
@@ -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()

src/com/android/settings/notification/SoundScreen.kt

+2 −2
Original line number Diff line number Diff line
@@ -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 {