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

9
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -31,6 +32,10 @@ import android.content.pm.ServiceInfo;
import android.os.RemoteException;
import android.service.quicksettings.TileService;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,10 +51,6 @@ import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
public class DevelopmentTilePreferenceControllerTest {

1
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development.qstile;
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;

2
tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
View File

@@ -20,7 +20,9 @@ import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeT
.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
.SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;