Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am: f22c79a27b" into... (51cdb8c0) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -19,12 +19,13 @@ package com.android.systemui.statusbar.phone;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;

		import android.support.test.filters.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper.RunWithLooper;

		import com.android.internal.app.NightDisplayController;
		import com.android.systemui.Prefs;
		import com.android.systemui.Prefs.Key;

		import android.support.test.filters.SmallTest;
		import android.testing.AndroidTestingRunner;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.qs.QSTileHost;

		@@ -35,6 +36,7 @@ import org.junit.runner.RunWith;
		import org.mockito.Mockito;

		@RunWith(AndroidTestingRunner.class)
		@RunWithLooper
		@SmallTest
		public class AutoTileManagerTest extends SysuiTestCase {