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

Commit 46302f92 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] Fix catalyst tests after dumping isVisible
  [Catalyst] Missing isAvailable migration on BatteryHeaderPreference
parents 43810d36 9142c94e

src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settingslib.datastore.NoOpKeyedObservable 
import com.android.settingslib.datastore.Permissions

import com.android.settingslib.fuelgauge.BatteryUtils

import com.android.settingslib.metadata.IntRangeValuePreference

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceLifecycleContext

import com.android.settingslib.metadata.PreferenceLifecycleProvider

import com.android.settingslib.metadata.PreferenceMetadata
@@ -42,6 +43,7 @@ import com.android.settingslib.widget.UsageProgressBarPreference 
class BatteryHeaderPreference :

    IntRangeValuePreference,

    PreferenceBinding,

    PreferenceAvailabilityProvider,

    PreferenceActionMetricsProvider,

    PreferenceLifecycleProvider {
@@ -70,6 +72,9 @@ class BatteryHeaderPreference : 


    override fun isIndexable(context: Context) = false



    override fun isAvailable(context: Context) =

        com.android.settings.Utils.isBatteryPresent(context)



    override fun onCreate(context: PreferenceLifecycleContext) {

        super.onCreate(context)

        batteryBroadcastReceiver =

tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt

+16 −12
Original line number Diff line number Diff line
@@ -21,33 +21,30 @@ import android.content.res.Resources 
import android.media.AudioManager

import android.os.Vibrator

import androidx.core.content.getSystemService

import androidx.test.core.app.ApplicationProvider

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

import com.android.settings.R

import com.android.settings.R.integer.config_vibration_supported_intensity_levels

import com.android.settings.flags.Flags

import com.android.settings.testutils.shadow.SettingsShadowResources

import com.android.settings.testutils.shadow.ShadowAudioManager

import com.android.settingslib.preference.CatalystScreenTestCase

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

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.doReturn

import org.mockito.kotlin.mock

import org.mockito.kotlin.spy

import org.mockito.kotlin.stub

import org.robolectric.Shadows.shadowOf

import org.robolectric.annotation.Config



// LINT.IfChange

@RunWith(AndroidJUnit4::class)

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

@Config(shadows = [ShadowAudioManager::class, SettingsShadowResources::class])

class VibrationIntensityScreenTest : CatalystScreenTestCase() {

    private lateinit var vibratorMock: Vibrator



    private val resourcesSpy: Resources =

        spy((ApplicationProvider.getApplicationContext() as Context).resources)

    private val resourcesSpy: Resources = spy(appContext.resources)



    private val context: Context =

        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {

        object : ContextWrapper(appContext) {

            override fun getSystemService(name: String): Any? =

                when {

                    name == VIBRATOR_SERVICE -> vibratorMock
@@ -76,7 +73,7 @@ class VibrationIntensityScreenTest : CatalystScreenTestCase() { 
    fun isAvailable_noVibrator_unavailable() {

        vibratorMock = mock { on { hasVibrator() } doReturn false }

        resourcesSpy.stub {

            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 3

            on { getInteger(config_vibration_supported_intensity_levels) } doReturn 3

        }

        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()

    }
@@ -85,7 +82,7 @@ class VibrationIntensityScreenTest : CatalystScreenTestCase() { 
    fun isAvailable_hasVibratorAndSingleIntensityLevel_unavailable() {

        vibratorMock = mock { on { hasVibrator() } doReturn true }

        resourcesSpy.stub {

            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1

            on { getInteger(config_vibration_supported_intensity_levels) } doReturn 1

        }

        assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()

    }
@@ -94,11 +91,18 @@ class VibrationIntensityScreenTest : CatalystScreenTestCase() { 
    fun isAvailable_hasVibratorAndMultipleIntensityLevels_available() {

        vibratorMock = mock { on { hasVibrator() } doReturn true }

        resourcesSpy.stub {

            on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 2

            on { getInteger(config_vibration_supported_intensity_levels) } doReturn 2

        }

        assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()

    }



    override fun migration() {

        // make screen available

        shadowOf(appContext.getSystemService(Vibrator::class.java)).setHasVibrator(true)

        SettingsShadowResources.overrideResource(config_vibration_supported_intensity_levels, 2)

        super.migration()

    }



    private fun setRingerMode(ringerMode: Int) {

        val audioManager = context.getSystemService<AudioManager>()

        audioManager?.ringerModeInternal = ringerMode

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

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.settings.network



import android.content.Context

import android.content.pm.PackageManager.FEATURE_TELEPHONY

import android.platform.test.annotations.DisableFlags

import android.telephony.SubscriptionInfo

import android.telephony.SubscriptionManager
@@ -48,6 +49,8 @@ class MobileNetworkListScreenTest : CatalystScreenTestCase() { 
            shadowOf(context.getSystemService(SubscriptionManager::class.java))

        val subscriptionInfo: SubscriptionInfo = mock()

        subscriptionManager.setAvailableSubscriptionInfos(subscriptionInfo)

        // make screen available

        shadowOf(context.packageManager).setSystemFeature(FEATURE_TELEPHONY, true)

        super.migration()

    }

}