Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eec6ff9 authored by jackqdyulei's avatar jackqdyulei
Browse files

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
parent 695638ce

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;