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

Commit f8900681 authored by Kenneth Ford's avatar Kenneth Ford
Browse files

Gerrit pre-upload formatting changes 

Flag: EXEMPT formatting change
Bug: N/A
Test: Build
Change-Id: I6ddc183e038becc47daa44d8adfd8018a410c8ba
parent d091d07e

packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/DeviceStateRepositoryTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ import org.junit.Before 
import org.junit.runner.RunWith

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import android.hardware.devicestate.DeviceState as PlatformDeviceState

import org.mockito.kotlin.whenever

import android.hardware.devicestate.DeviceState as PlatformDeviceState



@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import androidx.test.filters.SmallTest 
import com.android.keyguard.KeyguardViewController

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.defaultDeviceState

import com.android.systemui.deviceStateManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController
@@ -27,8 +29,6 @@ import com.android.systemui.statusbar.NotificationShadeWindowController 
import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.phone.BiometricUnlockController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.defaultDeviceState

import com.android.systemui.deviceStateManager

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argThat

import java.util.function.Predicate

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapperTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.defaultDeviceState

import com.android.systemui.deviceStateManager

import com.android.systemui.foldedDeviceStateList

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.qs.tiles.impl.custom.QSTileStateSubject

import com.android.systemui.qs.tiles.impl.rotation.domain.model.RotationLockTileModel
@@ -29,10 +32,7 @@ import com.android.systemui.qs.tiles.impl.rotation.qsRotationLockTileConfig 
import com.android.systemui.qs.tiles.viewmodel.QSTileState

import com.android.systemui.res.R

import com.android.systemui.statusbar.policy.DevicePostureController

import com.android.systemui.defaultDeviceState

import com.android.systemui.statusbar.policy.devicePostureController

import com.android.systemui.deviceStateManager

import com.android.systemui.foldedDeviceStateList

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

import org.junit.Before

import org.junit.Test

packages/SystemUI/multivalentTests/src/com/android/systemui/unfold/DisplaySwitchLatencyTrackerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ import org.mockito.ArgumentCaptor 
import org.mockito.Captor

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when` as whenever

import org.mockito.MockitoAnnotations

import org.mockito.kotlin.mock

import org.mockito.Mockito.`when` as whenever



@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(AndroidJUnit4::class)

packages/SystemUI/multivalentTests/src/com/android/systemui/util/UtilsTest.kt

+30 −33
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.testing.TestableResources 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.deviceStateManager

import com.android.systemui.kosmos.Kosmos

import junit.framework.Assert.assertFalse

import junit.framework.Assert.assertTrue

import org.junit.Before
@@ -43,7 +43,6 @@ class UtilsTest : SysuiTestCase() { 
    private val deviceStateManager = kosmos.deviceStateManager

    private lateinit var testableResources: TestableResources





    @Before

    fun setUp() {

        testableResources = context.orCreateTestableResources
@@ -78,12 +77,8 @@ class UtilsTest : SysuiTestCase() { 
            com.android.internal.R.array.config_foldedDeviceStates,

            intArrayOf(FOLDED_DEVICE_STATE.identifier)

        )

        whenever(deviceStateManager.supportedDeviceStates).thenReturn(

            listOf(

                FOLDED_DEVICE_STATE,

                UNFOLDED_DEVICE_STATE

            )

        )

        whenever(deviceStateManager.supportedDeviceStates)

            .thenReturn(listOf(FOLDED_DEVICE_STATE, UNFOLDED_DEVICE_STATE))

        assertTrue(Utils.isDeviceFoldable(testableResources.resources, deviceStateManager))

    }
@@ -94,32 +89,34 @@ class UtilsTest : SysuiTestCase() { 
            com.android.internal.R.array.config_foldedDeviceStates,

            intArrayOf(FOLDED_DEVICE_STATE.identifier)

        )

        whenever(deviceStateManager.supportedDeviceStates).thenReturn(

            listOf(

                FOLDED_DEVICE_STATE,

                UNFOLDED_DEVICE_STATE

            )

        )

        whenever(deviceStateManager.supportedDeviceStates)

            .thenReturn(listOf(FOLDED_DEVICE_STATE, UNFOLDED_DEVICE_STATE))

        assertTrue(Utils.isDeviceFoldable(testableResources.resources, deviceStateManager))

    }



    companion object {

        private val DEFAULT_DEVICE_STATE = DeviceState(

            DeviceState.Configuration.Builder(

                0 /* identifier */, "DEFAULT"

            ).build()

        )

        private val FOLDED_DEVICE_STATE = DeviceState(

        private val DEFAULT_DEVICE_STATE =

            DeviceState(DeviceState.Configuration.Builder(0 /* identifier */, "DEFAULT").build())

        private val FOLDED_DEVICE_STATE =

            DeviceState(

                DeviceState.Configuration.Builder(1 /* identifier */, "FOLDED")

                .setSystemProperties(setOf(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))

                    .setSystemProperties(

                        setOf(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY)

                    )

                    .setPhysicalProperties(

                        setOf(PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED)

                ).build()

                    )

        private val UNFOLDED_DEVICE_STATE = DeviceState(

                    .build()

            )

        private val UNFOLDED_DEVICE_STATE =

            DeviceState(

                DeviceState.Configuration.Builder(2 /* identifier */, "UNFOLDED")

                .setSystemProperties(setOf(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))

                .setPhysicalProperties(setOf(PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN))

                    .setSystemProperties(

                        setOf(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY)

                    )

                    .setPhysicalProperties(

                        setOf(PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN)

                    )

                    .build()

            )

    }