resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e

src/com/android/settings/datausage/AppDataUsageActivity.java

@@ -17,7 +17,6 @@ package com.android.settings.datausage;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.R;

src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java

@@ -42,7 +42,6 @@ import java.util.ArrayList;
 import java.util.Set;
 import java.util.TreeSet;
 
-
 public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
         LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
         AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener {

src/com/android/settings/deviceinfo/MigrateEstimateTask.java

@@ -29,9 +29,9 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
-import android.util.Log;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
+import android.util.Log;
 
 import java.io.IOException;
 import java.util.UUID;

src/com/android/settings/deviceinfo/PercentageBarChart.java

@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.android.settings.R;
-
-import java.util.Collection;
-
-/**
- * Draws a horizontal bar chart with colored slices, each represented by
- * {@link Entry}.
- */
-public class PercentageBarChart extends View {
-    private final Paint mEmptyPaint = new Paint();
-
-    private Collection<Entry> mEntries;
-
-    private int mMinTickWidth = 1;
-
-    public static class Entry implements Comparable<Entry> {
-        public final int order;
-        public final float percentage;
-        public final Paint paint;
-
-        protected Entry(int order, float percentage, Paint paint) {
-            this.order = order;
-            this.percentage = percentage;
-            this.paint = paint;
-        }
-
-        @Override
-        public int compareTo(Entry another) {
-            return order - another.order;
-        }
-    }
-
-    public PercentageBarChart(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart);
-        mMinTickWidth = a.getDimensionPixelSize(R.styleable.PercentageBarChart_minTickWidth, 1);
-        int emptyColor = a.getColor(R.styleable.PercentageBarChart_emptyColor, Color.BLACK);
-        a.recycle();
-
-        mEmptyPaint.setColor(emptyColor);
-        mEmptyPaint.setStyle(Paint.Style.FILL);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        final int left = getPaddingLeft();
-        final int right = getWidth() - getPaddingRight();
-        final int top = getPaddingTop();
-        final int bottom = getHeight() - getPaddingBottom();
-
-        final int width = right - left;
-
-        final boolean isLayoutRtl = isLayoutRtl();
-        if (isLayoutRtl) {
-            float nextX = right;
-
-            if (mEntries != null) {
-                for (final Entry e : mEntries) {
-                    final float entryWidth;
-                    if (e.percentage == 0.0f) {
-                        entryWidth = 0.0f;
-                    } else {
-                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
-                    }
-
-                    final float lastX = nextX - entryWidth;
-                    if (lastX < left) {
-                        canvas.drawRect(left, top, nextX, bottom, e.paint);
-                        return;
-                    }
-
-                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                    nextX = lastX;
-                }
-            }
-
-            canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
-        } else {
-            float lastX = left;
-
-            if (mEntries != null) {
-                for (final Entry e : mEntries) {
-                    final float entryWidth;
-                    if (e.percentage == 0.0f) {
-                        entryWidth = 0.0f;
-                    } else {
-                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
-                    }
-
-                    final float nextX = lastX + entryWidth;
-                    if (nextX > right) {
-                        canvas.drawRect(lastX, top, right, bottom, e.paint);
-                        return;
-                    }
-
-                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                    lastX = nextX;
-                }
-            }
-
-            canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
-        }
-    }
-
-    /**
-     * Sets the background for this chart. Callers are responsible for later
-     * calling {@link #invalidate()}.
-     */
-    @Override
-    public void setBackgroundColor(int color) {
-        mEmptyPaint.setColor(color);
-    }
-
-    /**
-     * Adds a new slice to the percentage bar chart. Callers are responsible for
-     * later calling {@link #invalidate()}.
-     * 
-     * @param percentage the total width that
-     * @param color the color to draw the entry
-     */
-    public static Entry createEntry(int order, float percentage, int color) {
-        final Paint p = new Paint();
-        p.setColor(color);
-        p.setStyle(Paint.Style.FILL);
-        return new Entry(order, percentage, p);
-    }
-
-    public void setEntries(Collection<Entry> entries) {
-        mEntries = entries;
-    }
-}

src/com/android/settings/deviceinfo/StorageVolumePreference.java

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo;
 import android.app.usage.StorageStatsManager;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java

@@ -17,18 +17,12 @@
 package com.android.settings.deviceinfo.firmwareversion;
 
 import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @SearchIndexable
 public class FirmwareVersionSettings extends DashboardFragment {
 

src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java

@@ -18,18 +18,12 @@ package com.android.settings.deviceinfo.hardwareinfo;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 @SearchIndexable
 public class HardwareInfoFragment extends DashboardFragment {
 

src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java

@@ -27,7 +27,6 @@ import com.android.settings.core.BasePreferenceController;
 
 import java.util.List;
 
-
 public abstract class LegalPreferenceController extends BasePreferenceController {
     private final PackageManager mPackageManager;
     private Preference mPreference;

src/com/android/settings/network/AllowedNetworkTypesListener.java

@@ -17,7 +17,6 @@
 package com.android.settings.network;
 
 import android.content.Context;
-import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -26,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.util.concurrent.Executor;
 
-
 /**
  * {@link TelephonyCallback} to listen to Allowed Network Types changed
  */
@@ -49,7 +47,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
     }
 
     /**
-     * Register a PhoneStateListener for Allowed Network Types changed.
+     * Register a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */
@@ -60,7 +58,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
     }
 
     /**
-     * Unregister a PhoneStateListener for Allowed Network Types changed.
+     * Unregister a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */

src/com/android/settings/network/MobilePlanPreferenceController.java

@@ -47,7 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.List;
 
-
 public class MobilePlanPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
 

src/com/android/settings/network/NetworkScorerPickerPreferenceController.java

@@ -23,7 +23,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 

src/com/android/settings/network/VpnPreferenceController.java

@@ -47,7 +47,6 @@ import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 
-
 public class VpnPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 

src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS user setting for enhanced 4G LTE
  */

src/com/android/settings/network/ims/ImsQueryProvisioningStat.java

@@ -21,7 +21,6 @@ import android.telephony.ims.feature.MmTelFeature;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS provision stat
  */

src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS tty on VoLte stat
  */

src/com/android/settings/network/ims/ImsQueryVtUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS VT enabled settings from user
  */

src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS WFC enabled settings from user
  */

src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java

@@ -22,11 +22,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.telephony.ims.ImsManager;
-import android.telephony.ims.ImsRcsManager;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java

@@ -37,7 +37,6 @@ import androidx.preference.SwitchPreference;
 
 import com.android.settings.network.SubscriptionUtil;
 
-
 /**
  * Controller for the "Contact Discovery" option present in MobileNetworkSettings.
  */

src/com/android/settings/network/telephony/MobileDataDialogFragment.java

@@ -31,7 +31,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
 
-
 /**
  * Dialog Fragment to show dialog for "mobile data"
  *

src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java

@@ -28,7 +28,6 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
 
-
 /**
  * Class to show the footer that can't connect to 5G when device is in DSDS mode.
  */

src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java

@@ -20,8 +20,6 @@
  */
 package com.android.settings.network.telephony;
 
-import android.content.Context;
-
 public interface TelephonyAvailabilityHandler {
 
     /**

src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java

@@ -41,7 +41,6 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.network.telephony.NetworkSelectSettings;
 import com.android.settings.network.telephony.TelephonyBasePreferenceController;
 
-
 /**
  * Preference controller for "Open network select"
  */

src/com/android/settings/sim/CallsSimListDialogFragment.java

@@ -18,7 +18,6 @@ package com.android.settings.sim;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionInfo;

src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java

@@ -27,6 +27,7 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
 import java.util.List;
+
 /*
  * Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic
  * AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app

src/com/android/settings/wifi/NetworkRequestDialogFragment.java

@@ -26,7 +26,6 @@ import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 import android.os.Handler;

src/com/android/settings/wifi/WifiAPITest.java

@@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Provide an interface for testing out the Wifi API
  */

src/com/android/settings/wifi/WifiConfigInfo.java

@@ -26,7 +26,6 @@ import com.android.settings.R;
 
 import java.util.List;
 
-
 /**
  * Configuration details saved by the user on the WifiSettings screen
  */

src/com/android/settings/wifi/WifiDialogActivity.java

@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;

src/com/android/settings/wifi/WifiInfo.java

@@ -22,7 +22,6 @@ import android.os.Bundle;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Wifi information menu item on the diagnostic screen
  */

src/com/android/settings/wifi/WifiStatusTest.java

@@ -45,7 +45,6 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.List;
 
-
 /**
  * Show the current status details of Wifi related fields
  */

src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java

@@ -30,7 +30,9 @@ import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.RadioButton;
 import android.widget.TextView;
+
 import androidx.appcompat.app.AlertDialog.Builder;
+
 import com.android.settings.CustomListPreference;
 import com.android.settings.R;
 

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

@@ -43,7 +43,6 @@ import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
-import com.android.ims.ImsConfig;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
@@ -57,7 +56,6 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-
 /**
  * Helper class to control slices for wifi calling settings.
  */

src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java

@@ -27,7 +27,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**

src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java

@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**

src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java

@@ -19,8 +19,6 @@ package com.android.settings.wifi.slice;
 import android.content.Context;
 import android.net.Uri;
 
-import com.android.settings.slices.SliceBackgroundWorker;
-
 /**
  * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
  */

tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.vpn2;
 
 import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
+
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;

tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java

@@ -35,10 +35,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class RegulatoryInfoPreferenceControllerTest {

tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java

@@ -34,10 +34,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class StorageSettingsTest {

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java

@@ -39,7 +39,6 @@ import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 
-
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
 public class BasebandVersionPreferenceControllerTest {

tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.eq;

tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java

@@ -39,6 +39,10 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.euicc.EuiccManager;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -52,10 +56,6 @@ import org.robolectric.RuntimeEnvironment;
 
 import java.util.Arrays;
 
-import androidx.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(RobolectricTestRunner.class)
 public class MobileNetworkListControllerTest {
     @Mock

tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java

@@ -33,7 +33,6 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.ReflectionHelpers;
 
-
 @RunWith(RobolectricTestRunner.class)
 public class MobileNetworkListFragmentTest {
     @Mock

tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java

@@ -60,8 +60,8 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;

tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java

@@ -15,7 +15,6 @@
  */
 package com.android.settings.sim;
 
-
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_INCOMING_MMS;
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;

tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java

@@ -24,14 +24,12 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import android.content.res.Resources;
 import android.telephony.SubscriptionManager;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;

tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java

@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
 import android.content.Context;
 import android.provider.Settings;
 
-import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import org.junit.Before;

tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java

@@ -16,10 +16,11 @@
 
 package com.android.settings.wifi.calling;
 
-import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
-        .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
 import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
         .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_DESCRIPTION;
+import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
+        .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
+
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyObject;
@@ -33,11 +34,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,6 +41,9 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public class DisclaimerItemListAdapterTest {
 

tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java

@@ -17,10 +17,10 @@
 package com.android.settings.wifi.calling;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -29,11 +29,9 @@ import android.content.SharedPreferences;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 
-import com.android.settings.R;
-
 import org.junit.Before;
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;

tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java

@@ -17,12 +17,10 @@
 package com.android.settings.wifi.calling;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyBoolean;
+
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -31,11 +29,9 @@ import android.content.SharedPreferences;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 
-import com.android.settings.R;
-
 import org.junit.Before;
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.wifi.calling;
 
+import static junit.framework.Assert.assertEquals;
+
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertEquals;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java

@@ -16,7 +16,7 @@
 
 package com.android.settings.wifi.tether;
 
-import static org.mockito.ArgumentMatchers.anyString;;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java

@@ -41,7 +41,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class MultiNetworkHeaderControllerTest {
     private static final String KEY_HEADER = "multi_network_header";

tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java

@@ -38,7 +38,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class EuiccPreferenceControllerTest {
     private static final int SUB_ID = 2;

tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java

@@ -47,7 +47,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class MobileDataPreferenceControllerTest {
     private static final int SUB_ID = 2;