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

Commit cf60ff7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move apn settings to network" into pi-dev

parents f13693eb 7a1c93dc

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.ApnSettings" />

                       android:value="com.android.settings.network.ApnSettings" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -1903,7 +1903,7 @@ 
                <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.ApnEditor" />

                       android:value="com.android.settings.network.ApnEditor" />

        </activity>



        <activity

src/com/android/settings/ResetNetworkConfirm.java

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.internal.telephony.PhoneConstants;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settings.network.ApnSettings;

import com.android.settingslib.RestrictedLockUtils;



/**

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings.core.gateway;



import com.android.settings.ApnEditor;

import com.android.settings.ApnSettings;

import com.android.settings.DateTimeSettings;

import com.android.settings.DeviceAdminSettings;

import com.android.settings.DisplaySettings;
@@ -91,6 +89,8 @@ import com.android.settings.inputmethod.UserDictionarySettings; 
import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.localepicker.LocaleListEditor;

import com.android.settings.location.LocationSettings;

import com.android.settings.network.ApnEditor;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;

src/com/android/settings/ApnEditor.java→src/com/android/settings/network/ApnEditor.java

+6 −7
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 */



package com.android.settings;

package com.android.settings.network;



import static android.content.Context.TELEPHONY_SERVICE;



import android.app.AlertDialog;

import android.app.Dialog;
@@ -47,9 +49,11 @@ import android.view.View.OnKeyListener; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.util.ArrayUtils;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settingslib.utils.ThreadUtils;



import java.util.Arrays;
@@ -57,11 +61,6 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Set;



import static android.content.Context.TELEPHONY_SERVICE;



/**

 * TODO(b/77339683): After loading all changes, please move this to network package.

 */

public class ApnEditor extends SettingsPreferenceFragment

        implements OnPreferenceChangeListener, OnKeyListener {

src/com/android/settings/ApnPreference.java→src/com/android/settings/network/ApnPreference.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings;

package com.android.settings.network;



import android.content.ContentUris;

import android.content.Context;
@@ -32,6 +32,8 @@ import android.widget.CompoundButton; 
import android.widget.RadioButton;

import android.widget.RelativeLayout;



import com.android.settings.R;



public class ApnPreference extends Preference implements

        CompoundButton.OnCheckedChangeListener, OnClickListener {

    final static String TAG = "ApnPreference";