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

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

Merge "Fix import order to finally match checkstyle" into main

parents 36cd5c4f a3dde250

packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import androidx.annotation.ColorInt; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.ColorUtils;





/**

 * Generate sets of colors that are shades of the same color

 */

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/BouncerSwipeTouchHandlerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import org.mockito.MockitoAnnotations; 


import java.util.Collections;

import java.util.Optional;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class BouncerSwipeTouchHandlerTest extends SysuiTestCase {

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ import com.android.systemui.util.time.SystemClock; 


import dagger.Lazy;



import kotlinx.coroutines.CoroutineScope;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -132,8 +134,6 @@ import org.mockito.junit.MockitoRule; 
import java.util.ArrayList;

import java.util.List;



import kotlinx.coroutines.CoroutineScope;



@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWithLooper(setAsMainLooper = true)

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ import com.android.systemui.complication.ComplicationHostViewController; 
import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.statusbar.BlurUtils;



import kotlinx.coroutines.CoroutineDispatcher;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -56,8 +58,6 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import kotlinx.coroutines.CoroutineDispatcher;



@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWithLooper(setAsMainLooper = true)

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/conditions/AssistantAttentionConditionTest.java

+2 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import com.android.systemui.assist.AssistManager; 
import com.android.systemui.assist.AssistManager.VisualQueryAttentionListener;

import com.android.systemui.shared.condition.Condition;



import kotlinx.coroutines.CoroutineScope;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -38,8 +40,6 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import kotlinx.coroutines.CoroutineScope;



@SmallTest

@RunWith(AndroidJUnit4.class)

@android.platform.test.annotations.EnabledOnRavenwood