PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update airplane mode key to match framework constant

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

Bug: 80106671
Test: robotests
Change-Id: I898befffbdafc3004fc127414edd04f60ff2554e
This commit is contained in:
Matthew Fritze
2018-05-22 13:04:38 -07:00
parent c4a3393b45
commit 8f36eb8cfb
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -15,14 +15,13 @@
*/
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 androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.telephony.TelephonyIntents;
@@ -36,14 +35,16 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class AirplaneModePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause,
AirplaneModeEnabler.OnAirplaneModeChangedListener {
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;
@@ -51,7 +52,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();
@@ -64,7 +64,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) {