方案1:
--- a/packages/apps/Settings/res/xml/wireless_settings.xml
+++ b/packages/apps/Settings/res/xml/wireless_settings.xml
@@ -58,8 +58,8 @@
android:title="@string/network_settings_title"
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
- settings:useAdminDisabledSummary="true"
- android:dependency="toggle_airplane">
+ settings:useAdminDisabledSummary="true">
+ <!--android:dependency="toggle_airplane">-->
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.phone"
diff --git a/packages/apps/Settings/src/com/android/settings/WirelessSettings.java b/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
index 4fb78e1..f6e2a63 100755
--- a/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
@@ -386,9 +386,9 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
}
// Remove Airplane Mode settings if it's a stationary device such as a TV.
- if (mPm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+ //if (mPm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
removePreference(KEY_TOGGLE_AIRPLANE);
- }
+ //}
// Enable Proxy selector settings if allowed.
Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
@@ -543,9 +543,9 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
final PackageManager pm = context.getPackageManager();
// Remove Airplane Mode settings if it's a stationary device such as a TV.
- if (pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+ //if (pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
result.add(KEY_TOGGLE_AIRPLANE);
- }
+ //}
// proxy UI disabled until we have better app support
result.add(KEY_PROXY_SETTINGS);
方案2:
--- a/packages/apps/Settings/res/xml/wireless_settings.xml
+++ b/packages/apps/Settings/res/xml/wireless_settings.xml
@@ -18,10 +18,10 @@
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/radio_controls_title">
- <SwitchPreference
+ <!--<SwitchPreference
android:key="toggle_airplane"
android:title="@string/airplane_mode"
- android:disableDependentsState="true" />
+ android:disableDependentsState="true" />-->
<SwitchPreference
android:key="toggle_nfc"
@@ -58,8 +58,8 @@
android:title="@string/network_settings_title"
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
- settings:useAdminDisabledSummary="true"
- android:dependency="toggle_airplane">
+ settings:useAdminDisabledSummary="true">
+ <!--android:dependency="toggle_airplane">-->
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.phone"
diff --git a/packages/apps/Settings/src/com/android/settings/WirelessSettings.java b/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
index 4fb78e1..51eaf55 100755
--- a/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
@@ -306,13 +306,13 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
final boolean isAdmin = mUm.isAdminUser();
final Activity activity = getActivity();
- mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
+ //mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
m4gNetworkPreference = (SwitchPreference) findPreference(KEY_TOGGLE_4GNETWORK);
SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC);
RestrictedPreference androidBeam = (RestrictedPreference) findPreference(
KEY_ANDROID_BEAM_SETTINGS);
- mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
+ //mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
@@ -428,7 +428,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
public void onResume() {
super.onResume();
- mAirplaneModeEnabler.resume();
+ //mAirplaneModeEnabler.resume();
if (mNfcEnabler != null) {
mNfcEnabler.resume();
}
@@ -459,7 +459,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
public void onPause() {
super.onPause();
- mAirplaneModeEnabler.pause();
+ //mAirplaneModeEnabler.pause();
if (mNfcEnabler != null) {
mNfcEnabler.pause();
}
@@ -467,12 +467,12 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (requestCode == REQUEST_CODE_EXIT_ECM) {
+ /*if (requestCode == REQUEST_CODE_EXIT_ECM) {
Boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
// Set Airplane mode based on the return value and checkbox state
mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
mAirplaneModePreference.isChecked());
- }
+ }*/
super.onActivityResult(requestCode, resultCode, data);
}