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

Commit d0d0e6f2 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Moves quickaffordance tests to correct pakcage." into tm-qpr-dev am: 7eabd5f4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19487937



Change-Id: I26383909bc0778308a0495d02188adb7641cc00c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1846a65a 7eabd5f4

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/HomeControlsKeyguardQuickAffordanceConfigTest.kt→packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfigTest.kt

+12 −13
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ 
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 */



package com.android.systemui.keyguard.data.repository

package com.android.systemui.keyguard.data.quickaffordance



import androidx.test.filters.SmallTest

import com.android.systemui.R
@@ -22,8 +23,6 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.animation.ActivityLaunchAnimator

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.controls.dagger.ControlsComponent

import com.android.systemui.keyguard.data.quickaffordance.HomeControlsKeyguardQuickAffordanceConfig

import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig

import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig.OnClickedResult

import com.android.systemui.util.mockito.mock

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

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/QrCodeScannerKeyguardQuickAffordanceConfigTest.kt→packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfigTest.kt

+12 −13
Original line number Diff line number Diff line
@@ -12,16 +12,15 @@ 
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 */



package com.android.systemui.keyguard.data.repository

package com.android.systemui.keyguard.data.quickaffordance



import android.content.Intent

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig

import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig.OnClickedResult

import com.android.systemui.keyguard.data.quickaffordance.QrCodeScannerKeyguardQuickAffordanceConfig

import com.android.systemui.qrcodescanner.controller.QRCodeScannerController

import com.android.systemui.util.mockito.argumentCaptor

import com.android.systemui.util.mockito.mock

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt→packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt

+12 −13
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ 
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 */



package com.android.systemui.keyguard.data.repository

package com.android.systemui.keyguard.data.quickaffordance



import android.graphics.drawable.Drawable

import android.service.quickaccesswallet.GetWalletCardsResponse
@@ -23,8 +24,6 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.animation.ActivityLaunchAnimator

import com.android.systemui.containeddrawable.ContainedDrawable

import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig

import com.android.systemui.keyguard.data.quickaffordance.QuickAccessWalletKeyguardQuickAffordanceConfig

import com.android.systemui.plugins.ActivityStarter

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

import com.android.systemui.util.mockito.mock