PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder and clean up imports.

Browse Source 
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
This commit is contained in:
Fan Zhang
2018-06-18 15:21:41 -07:00
parent 2c6cccb90c
commit c7162cd24d
1315 changed files with 3688 additions and 3126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
View File

@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import android.text.format.DateFormat;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,6 +36,8 @@ import org.robolectric.shadows.ShadowApplication;
import java.util.List;
import java.util.Locale;
import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoTimeFormatPreferenceControllerTest {

3
tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
View File

@@ -23,7 +23,6 @@ import static org.robolectric.shadow.api.Shadow.extract;
import android.content.Context;
import android.net.ConnectivityManager;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -36,6 +35,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
public class AutoTimeZonePreferenceControllerTest {

5
tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
View File

@@ -22,8 +22,6 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,6 +35,9 @@ import org.robolectric.shadows.ShadowApplication;
import java.util.List;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
public class TimeFormatPreferenceControllerTest {

4
tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.datetime.timezone;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -29,7 +29,7 @@ import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static com.google.common.truth.Truth.assertThat;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
@RunWith(SettingsRobolectricTestRunner.class)
public class BaseTimeZoneAdapterTest {

4
tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.datetime.timezone;
import static org.mockito.Mockito.mock;
import android.content.Context;
import android.icu.util.TimeZone;
@@ -35,8 +37,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import static org.mockito.Mockito.mock;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class })
public class BaseTimeZoneInfoPickerTest {

6
tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java
View File

@@ -16,9 +16,10 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,9 +27,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import static com.google.common.truth.Truth.assertThat;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class BaseTimeZonePreferenceControllerTest {

8
tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
@@ -34,10 +38,6 @@ import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
public class FixedOffsetPickerTest {

5
tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
View File

@@ -16,9 +16,10 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import android.icu.util.TimeZone;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -27,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import static com.google.common.truth.Truth.assertThat;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class FixedOffsetPreferenceControllerTest {

5
tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java
View File

@@ -16,8 +16,9 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,7 +27,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import static com.google.common.truth.Truth.assertThat;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class RegionPreferenceControllerTest {

1
tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.icu.text.Collator;
import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator;
@@ -31,8 +33,6 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
public class RegionZonePickerTest {

5
tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java
View File

@@ -16,9 +16,10 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import android.icu.util.TimeZone;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -27,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import static com.google.common.truth.Truth.assertThat;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class RegionZonePreferenceControllerTest {

4
tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import android.text.Spannable;
import com.android.settings.R;
@@ -25,8 +27,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
public class SpannableUtilTest {

4
tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
View File

@@ -19,8 +19,6 @@ package com.android.settings.datetime.timezone;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import androidx.preference.Preference;
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,6 +29,8 @@ import org.robolectric.RuntimeEnvironment;
import java.util.Date;
import java.util.Locale;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class TimeZoneInfoPreferenceControllerTest {