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

Commit aa85be1d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "catalyst" into main 

* changes:
  [Catalyst] Refine MobileNetworkListScreenTest
  [Catalyst] Add category hierarchy for Display screen
parents 2ea25823 696c2556

res/xml/display_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    settings:keywords="@string/keywords_display">



    <PreferenceCategory

        android:key="category_brightness"

        android:title="@string/category_name_brightness"

        android:order="-200">
@@ -44,6 +45,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_lock_display"

        android:title="@string/category_name_lock_display"

        android:order="-190">
@@ -79,6 +81,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_key_appearance"

        android:title="@string/category_name_appearance"

        android:order="-180">
@@ -133,6 +136,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="category_other"

        android:title="@string/category_name_display_controls"

        android:order="-150">

src/com/android/settings/display/DisplayScreen.kt

+18 −9
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.metadata.preferenceHierarchy 
import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme

import com.android.systemui.shared.Flags.ambientAod

import com.android.settingslib.metadata.PreferenceCategory as Category



@ProvidePreferenceScreen(DisplayScreen.KEY)

open class DisplayScreen :
@@ -57,17 +58,25 @@ open class DisplayScreen : 


    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

            +Category("category_brightness", R.string.category_name_brightness) order -200 += {

                +BrightnessLevelPreference()

                +AutoBrightnessScreen.KEY

            }

            +Category("category_lock_display", R.string.category_name_lock_display) order -190 += {

                +LockScreenPreferenceScreen.KEY

                if (ambientAod()) {

                    +AmbientDisplayAlwaysOnPreferenceScreen.KEY

                }

            }

            +Category("category_key_appearance", R.string.category_name_appearance) order -180 += {

                +DarkModeScreen.KEY

            }

            +Category("category_other", R.string.category_name_display_controls) order -150 += {

                +PeakRefreshRateSwitchPreference()

                if (Flags.catalystScreensaver()) {

                    +ScreensaverScreen.KEY

                }

            +PeakRefreshRateSwitchPreference()

            }

        }



    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =

tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt

+20 −3
Original line number Diff line number Diff line
@@ -15,14 +15,20 @@ 
 */

package com.android.settings.network



import androidx.test.ext.junit.runners.AndroidJUnit4

import android.content.Context

import android.platform.test.annotations.DisableFlags

import android.telephony.SubscriptionInfo

import android.telephony.SubscriptionManager

import androidx.test.core.app.ApplicationProvider

import com.android.settings.flags.Flags

import com.android.settingslib.preference.CatalystScreenTestCase

import com.google.common.truth.Truth.assertThat

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.mock

import org.robolectric.Shadows.shadowOf

import org.robolectric.annotation.Config

import org.robolectric.shadows.ShadowSubscriptionManager



@RunWith(AndroidJUnit4::class)

class MobileNetworkListScreenTest : CatalystScreenTestCase() {

    override val preferenceScreenCreator = MobileNetworkListScreen()
@@ -33,4 +39,15 @@ class MobileNetworkListScreenTest : CatalystScreenTestCase() { 
    fun key() {

        assertThat(preferenceScreenCreator.key).isEqualTo(MobileNetworkListScreen.KEY)

    }



    @DisableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED)

    @Config(shadows = [ShadowSubscriptionManager::class])

    override fun migration() {

        val context: Context = ApplicationProvider.getApplicationContext()

        val subscriptionManager =

            shadowOf(context.getSystemService(SubscriptionManager::class.java))

        val subscriptionInfo: SubscriptionInfo = mock()

        subscriptionManager.setAvailableSubscriptionInfos(subscriptionInfo)

        super.migration()

    }

}