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

Commit 8ad8516f authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Update airplane mode key to match framework constant 

Change pref key for airplane mode to "airplane_mode" to match the
constant declared in SettingsSlicesContract.

Bug: 80106671
Test: robotests
Change-Id: I625bed440dd7f1f8509cd00ced5ba67f08a0e737
Merged-In: I898befffbdafc3004fc127414edd04f60ff2554e
parent a419c471

res/xml/network_and_internet.xml

+2 −1
Original line number Diff line number Diff line
@@ -68,12 +68,13 @@ 
        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="toggle_airplane"

        android:key="airplane_mode"

        android:title="@string/airplane_mode"

        android:icon="@drawable/ic_airplanemode_active"

        android:disableDependentsState="true"

        android:order="5"

        settings:controller="com.android.settings.network.AirplaneModePreferenceController"

        settings:platform_slice="true"

        settings:userRestriction="no_airplane_mode"/>



    <Preference

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

+4 −4
Original line number Diff line number Diff line
@@ -15,11 +15,14 @@ 
 */

package com.android.settings.network;



import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;



import android.app.Fragment;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.SystemProperties;

import android.provider.SettingsSlicesContract;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;
@@ -41,8 +44,6 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 


    public static final int REQUEST_CODE_EXIT_ECM = 1;



    public static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";



    private static final String EXIT_ECM_RESULT = "exit_ecm_result";



    private Fragment mFragment;
@@ -50,7 +51,6 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
    private AirplaneModeEnabler mAirplaneModeEnabler;

    private SwitchPreference mAirplaneModePreference;





    public AirplaneModePreferenceController(Context context, String key) {

        super(context, key);

        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
@@ -63,7 +63,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 


    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (KEY_TOGGLE_AIRPLANE.equals(preference.getKey()) && Boolean.parseBoolean(

        if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && Boolean.parseBoolean(

                SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {

            // In ECM mode launch ECM app dialog

            if (mFragment != null) {

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

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.ServiceManager; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.SettingsSlicesContract;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;
@@ -83,7 +84,7 @@ public class VpnPreferenceController extends AbstractPreferenceController 
        // Manually set dependencies for Wifi when not toggleable.

        if (mToggleable == null || !mToggleable.contains(Settings.Global.RADIO_WIFI)) {

            if (mPreference != null) {

                mPreference.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);

                mPreference.setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);

            }

        }

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.pm.PackageManager;

import android.provider.Settings;

import android.provider.SettingsSlicesContract;

import android.support.v7.preference.PreferenceManager;

import android.support.v7.preference.PreferenceScreen;
@@ -69,12 +70,12 @@ public class AirplaneModePreferenceControllerTest { 
        mResolver = RuntimeEnvironment.application.getContentResolver();

        doReturn(mPackageManager).when(mContext).getPackageManager();

        mController = new AirplaneModePreferenceController(mContext,

                AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);

                SettingsSlicesContract.KEY_AIRPLANE_MODE);



        mPreferenceManager = new PreferenceManager(mContext);

        mScreen = mPreferenceManager.createPreferenceScreen(mContext);

        mPreference = new RestrictedSwitchPreference(mContext);

        mPreference.setKey("toggle_airplane");

        mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);

        mScreen.addPreference(mPreference);

        mController.setFragment(null);

        mLifecycleOwner = () -> mLifecycle;

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.net.IConnectivityManager; 
import android.net.NetworkRequest;

import android.os.IBinder;

import android.os.UserHandle;

import android.provider.SettingsSlicesContract;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;
@@ -88,7 +89,7 @@ public class VpnPreferenceControllerTest { 
        doReturn(true).when(mController).isAvailable();

        mController.displayPreference(mScreen);



        verify(mPreference).setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);

        verify(mPreference).setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);

    }



    @Test