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

Commit dc0a407d authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

resolve merge conflicts of a5e11433 to master 

Test: runtest systemui
Change-Id: I898b2467474e029cdaba0f9d21fe8fa70dd45318
parents 4faad800 a5e11433

packages/SystemUI/tests/src/com/android/systemui/RoundedCornersTest.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.Fragment;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;

import android.view.Display;
@@ -52,7 +53,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



@RunWith(AndroidTestingRunner.class)

@Ignore("flaking")

@FlakyTest

@SmallTest

public class RoundedCornersTest extends SysuiTestCase {

packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.support.test.filters.SmallTest;

import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -45,8 +46,8 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@SmallTest

@FlakyTest

public class QSDetailTest extends SysuiTestCase {



    private MetricsLogger mMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.support.test.filters.SmallTest;

import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -40,8 +41,8 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@SmallTest

@FlakyTest

public class QSFooterTest extends LeakCheckedTest {



    private QSFooter mFooter;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; 
import android.app.FragmentController;

import android.app.FragmentManagerNonConfig;

import android.os.Looper;

import android.support.test.filters.FlakyTest;



import com.android.internal.logging.MetricsLogger;

import com.android.keyguard.CarrierText;
@@ -50,8 +51,8 @@ import android.widget.FrameLayout; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper(setAsMainLooper = true)

@Ignore("flaking")

@SmallTest

@FlakyTest

public class QSFragmentTest extends SysuiBaseFragmentTest {



    private MetricsLogger mMockMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.support.test.filters.SmallTest;

import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -38,8 +39,8 @@ import java.util.Collections; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@SmallTest

@FlakyTest

public class QSPanelTest extends SysuiTestCase {



    private MetricsLogger mMetricsLogger;