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

Sort imports

Browse Source 
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
This commit is contained in:
Fan Zhang
2018-08-28 15:11:40 -07:00
parent 61a909c662
commit 23f8d59d02
1483 changed files with 4655 additions and 3953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.content.Context;

1
tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.content.Context;

1
tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.deviceadmin;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;

5
tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.deviceadmin;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -29,6 +30,8 @@ import android.content.Context;
import android.content.IntentFilter;
import android.os.UserHandle;
import androidx.lifecycle.LifecycleOwner;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
@@ -40,8 +43,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import androidx.lifecycle.LifecycleOwner;
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceAdminListPreferenceControllerTest {

5
tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -24,6 +25,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.BasePreferenceController;
@@ -36,8 +39,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
public class PictureInPictureDetailPreferenceControllerTest {

1
tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;

1
tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;

1
tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
View File

@@ -24,7 +24,6 @@ import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;

2
tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
View File

@@ -17,7 +17,9 @@
package com.android.settings.applications.specialaccess.premiumsms;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.content.Context;

2
tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
View File

@@ -17,7 +17,9 @@
package com.android.settings.applications.specialaccess.premiumsms;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.content.Context;

1
tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.vrlistener;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;

1
tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.vrlistener;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;