[Catalyst] Sync APM preference key value
Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: Manual testing
atest -c AirplaneModePreferenceControllerTest \
AirplaneModePreferenceControllerComponentTest
Change-Id: Ibd1e6af39afa768ef40d280ca97fb39ce38bd1c0
diff --git a/src/com/android/settings/network/AirplaneModePreference.kt b/src/com/android/settings/network/AirplaneModePreference.kt
index 5b7903c..2d9fbe9 100644
--- a/src/com/android/settings/network/AirplaneModePreference.kt
+++ b/src/com/android/settings/network/AirplaneModePreference.kt
@@ -18,7 +18,7 @@
import android.content.Context
import android.content.pm.PackageManager
-import android.provider.Settings.Global.AIRPLANE_MODE_ON
+import android.provider.Settings
import androidx.annotation.DrawableRes
import com.android.settings.R
import com.android.settingslib.datastore.SettingsGlobalStore
@@ -27,7 +27,7 @@
// LINT.IfChange
class AirplaneModePreference :
- SwitchPreference(AIRPLANE_MODE_ON, R.string.airplane_mode),
+ SwitchPreference(KEY, R.string.airplane_mode),
PreferenceAvailabilityProvider {
override val icon: Int
@@ -38,5 +38,9 @@
override fun isAvailable(context: Context) =
(context.resources.getBoolean(R.bool.config_show_toggle_airplane)
&& !context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK))
+
+ companion object {
+ const val KEY = Settings.Global.AIRPLANE_MODE_ON
+ }
}
// LINT.ThenChange(AirplaneModePreferenceController.java)
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 430feb1..ca8595f 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -15,8 +15,6 @@
*/
package com.android.settings.network;
-import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
-
import static com.android.settings.network.SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG;
import static com.android.settings.network.SatelliteWarningDialogActivity.TYPE_IS_AIRPLANE_MODE;
@@ -95,7 +93,7 @@
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && isAvailable()) {
+ if (AirplaneModePreference.KEY.equals(preference.getKey()) && isAvailable()) {
// In ECM mode launch ECM app dialog
if (mAirplaneModeEnabler.isInEcmMode()) {
if (mFragment != null) {
diff --git a/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java b/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
index 27e67e5..9617cfd 100644
--- a/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
+++ b/tests/componenttests/src/com/android/settings/network/AirplaneModePreferenceControllerComponentTest.java
@@ -20,7 +20,6 @@
import android.app.Instrumentation;
import android.provider.Settings;
-import android.provider.SettingsSlicesContract;
import android.util.Log;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -64,7 +63,7 @@
public void test_on_off_airplane_mode_multiple_times() {
AirplaneModePreferenceController controller =
new AirplaneModePreferenceController(mInstrumentation.getTargetContext(),
- SettingsSlicesContract.KEY_AIRPLANE_MODE);
+ AirplaneModePreference.KEY);
for (int i = 0; i < 10; ++i) {
Log.d(TAG, "Test #" + (i + 1));
diff --git a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 7612805..2205929 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -16,8 +16,6 @@
package com.android.settings.network;
-import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -78,12 +76,12 @@
mResolver = mContext.getContentResolver();
doReturn(mPackageManager).when(mContext).getPackageManager();
mController = new AirplaneModePreferenceController(mContext,
- KEY_AIRPLANE_MODE);
+ AirplaneModePreference.KEY);
mPreferenceManager = new PreferenceManager(mContext);
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreference = new RestrictedSwitchPreference(mContext);
- mPreference.setKey(KEY_AIRPLANE_MODE);
+ mPreference.setKey(AirplaneModePreference.KEY);
mScreen.addPreference(mPreference);
mController.setFragment(null);
}