Change packagename to telephony

Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1

AndroidManifest.xml

@@ -131,7 +131,7 @@
                   android:launchMode="singleTask">
         </activity>
 
-        <activity android:name=".mobilenetwork.MobileSettingsActivity"
+        <activity android:name=".network.telephony.MobileSettingsActivity"
                   android:label="@string/network_settings_title"
                   android:theme="@style/Theme.Settings.Home"
                   android:launchMode="singleTask">

res/xml/cdma_options.xml

@@ -17,7 +17,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.settings.mobilenetwork.CdmaSystemSelectListPreference
+    <com.android.settings.network.telephony.CdmaSystemSelectListPreference
         android:key="cdma_system_select_key"
         android:title="@string/cdma_system_select_title"
         android:summary="@string/cdma_system_select_summary"
@@ -25,7 +25,7 @@
         android:entryValues="@array/cdma_system_select_values"
         android:dialogTitle="@string/cdma_system_select_dialogtitle" />
 
-    <com.android.settings.mobilenetwork.CdmaSubscriptionListPreference
+    <com.android.settings.network.telephony.CdmaSubscriptionListPreference
         android:key="cdma_subscription_key"
         android:title="@string/cdma_subscription_title"
         android:summary="@string/cdma_subscription_summary"

res/xml/gsm_umts_options.xml

@@ -17,7 +17,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.settings.mobilenetwork.NetworkOperators
+    <com.android.settings.network.telephony.NetworkOperators
         android:key="network_operators_category_key"
         android:title="@string/network_operator_category"
         android:persistent="false">
@@ -36,7 +36,7 @@
             android:key="button_choose_network_key"
             android:title="@string/choose_network_title"
             android:fragment="com.android.phone.NetworkSelectSetting" />
-    </com.android.settings.mobilenetwork.NetworkOperators>
+    </com.android.settings.network.telephony.NetworkOperators>
 
     <!--We want separate APN setting from reset of settings because-->
     <!--we want user to change it with caution.-->

res/xml/network_setting_fragment.xml

@@ -29,7 +29,7 @@
         android:key="mobile_data_enable"
         android:title="@string/mobile_data_settings_title"
         android:summary="@string/mobile_data_settings_summary"
-        settings:controller="com.android.settings.mobilenetwork.MobileDataPreferenceController"/>
+        settings:controller="com.android.settings.network.telephony.MobileDataPreferenceController"/>
 
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="button_roaming_key"
@@ -38,7 +38,7 @@
         android:summaryOn="@string/roaming_enable"
         android:summaryOff="@string/roaming_disable"/>
 
-    <com.android.settings.mobilenetwork.DataUsagePreference
+    <com.android.settings.network.telephony.DataUsagePreference
         android:key="data_usage_summary"
         android:title="@string/data_usage_title" />
 

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

@@ -36,7 +36,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.mobilenetwork.MobileSettingsActivity;
+import com.android.settings.network.telephony.MobileSettingsActivity;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.Utils;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Intent;
 import android.os.PersistableBundle;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.os.Bundle;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.os.Bundle;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.telephony.CellIdentity;
 import android.telephony.CellIdentityCdma;

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

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.NetworkTemplate;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2018 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.content.Intent;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.app.Dialog;
 import android.content.Context;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.database.ContentObserver;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
 
@@ -62,8 +62,6 @@ import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Intent;
 import android.os.Bundle;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.graphics.Color;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.app.ProgressDialog;
 import android.content.Context;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.annotation.IntDef;
 import android.telephony.AccessNetworkConstants.AccessNetworkType;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2018 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.app.ProgressDialog;
 import android.content.Context;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.content.Context;
 import android.os.AsyncTask;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -26,7 +26,6 @@ import android.telephony.CarrierConfigManager;
 
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 
 
 import com.android.settings.R;

src/com/android/settings/slices/SettingsSliceProvider.java

@@ -42,7 +42,7 @@ import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.flashlight.FlashlightSliceBuilder;
 import com.android.settings.location.LocationSliceBuilder;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiSlice;

src/com/android/settings/slices/SliceBroadcastReceiver.java

@@ -19,7 +19,7 @@ package com.android.settings.slices;
 import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED;
 import static com.android.settings.flashlight.FlashlightSliceBuilder
         .ACTION_FLASHLIGHT_SLICE_CHANGED;
-import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper
+import static com.android.settings.network.telephony.Enhanced4gLteSliceHelper
         .ACTION_ENHANCED_4G_LTE_CHANGED;
 import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;

src/com/android/settings/slices/SlicesFeatureProvider.java

@@ -2,7 +2,7 @@ package com.android.settings.slices;
 
 import android.content.Context;
 
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 
 /**

src/com/android/settings/slices/SlicesFeatureProviderImpl.java

@@ -2,7 +2,7 @@ package com.android.settings.slices;
 
 import android.content.Context;
 
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settingslib.utils.ThreadUtils;
 

tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 import static android.app.slice.Slice.HINT_TITLE;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 

tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;

tests/robotests/src/com/android/settings/network/telephony/MobileSettingsActivityTest.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
 
-import static com.android.settings.mobilenetwork.MobileSettingsActivity.MOBILE_SETTINGS_TAG;
+import static com.android.settings.network.telephony.MobileSettingsActivity.MOBILE_SETTINGS_TAG;
 
 import static com.google.common.truth.Truth.assertThat;