android8.1去掉蓝牙和wifi相关设置

tech2025-08-31 113

去掉蓝牙和wifi相关设置修改

diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index a55edde..9f7eec0 100755 --- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -36,7 +36,7 @@ <fraction name="def_window_transition_scale">100%</fraction> <bool name="def_haptic_feedback">true</bool> - <bool name="def_bluetooth_on">true</bool> + <bool name="def_bluetooth_on">false</bool> <bool name="def_wifi_display_on">false</bool> <bool name="def_install_non_market_apps">true</bool> <bool name="def_package_verifier_enable">false</bool> @@ -48,7 +48,7 @@ <bool name="assisted_gps_enabled">true</bool> <bool name="def_netstats_enabled">true</bool> <bool name="def_usb_mass_storage_enabled">true</bool> - <bool name="def_wifi_on">true</bool> + <bool name="def_wifi_on">false</bool>  <integer name="def_wifi_sleep_policy">2</integer> <bool name="def_wifi_wakeup_enabled">true</bool> diff --git a/frameworks/base/packages/SystemUI/res/values/config.xml b/frameworks/base/packages/SystemUI/res/values/config.xml index d25df2a..da752bc 100755 --- a/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/frameworks/base/packages/SystemUI/res/values/config.xml @@ -107,7 +107,7 @@  <string name="quick_settings_tiles_default" translatable="false"> - wifi,bt,dnd,flashlight,rotation,cell,airplane,cast + dnd,flashlight,rotation,cell,airplane,cast </string>  diff --git a/packages/apps/Settings/AndroidManifest.xml b/packages/apps/Settings/AndroidManifest.xml index 9d0dbcc..9303e74 100755 --- a/packages/apps/Settings/AndroidManifest.xml +++ b/packages/apps/Settings/AndroidManifest.xml @@ -152,7 +152,7 @@ <activity android:name=".Settings$NetworkDashboardActivity" android:taskAffinity="com.android.settings" android:label="@string/network_dashboard_title" - android:icon="@drawable/ic_settings_wireless" + android:icon="@drawable/ic_ethernet" android:parentActivityName="Settings"> <intent-filter android:priority="1"> <action android:name="android.settings.WIRELESS_SETTINGS" /> diff --git a/packages/apps/Settings/res/xml/connected_devices.xml b/packages/apps/Settings/res/xml/connected_devices.xml old mode 100644 new mode 100755 index 3e2e0ed..b4c9be0 --- a/packages/apps/Settings/res/xml/connected_devices.xml +++ b/packages/apps/Settings/res/xml/connected_devices.xml @@ -18,11 +18,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/connected_devices_dashboard_title"> - <com.android.settings.widget.MasterSwitchPreference +  <SwitchPreference android:key="toggle_nfc" diff --git a/packages/apps/Settings/res/xml/network_and_internet.xml b/packages/apps/Settings/res/xml/network_and_internet.xml index 61a0dca..d84e74f 100755 --- a/packages/apps/Settings/res/xml/network_and_internet.xml +++ b/packages/apps/Settings/res/xml/network_and_internet.xml @@ -19,7 +19,7 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/network_dashboard_title"> - <com.android.settings.widget.MasterSwitchPreference +  <com.android.settingslib.RestrictedPreference android:key="mobile_network_settings" diff --git a/packages/apps/Settings/src/com/android/settings/SettingsActivity.java b/packages/apps/Settings/src/com/android/settings/SettingsActivity.java index b873d71..62611bb 100755 --- a/packages/apps/Settings/src/com/android/settings/SettingsActivity.java +++ b/packages/apps/Settings/src/com/android/settings/SettingsActivity.java @@ -770,11 +770,11 @@ public class SettingsActivity extends SettingsDrawerActivity String packageName = getPackageName(); somethingChanged = setTileEnabled( new ComponentName(packageName, WifiSettingsActivity.class.getName()), - pm.hasSystemFeature(PackageManager.FEATURE_WIFI), isAdmin) || somethingChanged; + false/*pm.hasSystemFeature(PackageManager.FEATURE_WIFI)*/, isAdmin) || somethingChanged; somethingChanged = setTileEnabled(new ComponentName(packageName, Settings.BluetoothSettingsActivity.class.getName()), - pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin) + false/*pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)*/, isAdmin) || somethingChanged; boolean isDataPlanFeatureEnabled = FeatureFactory.getFactory(this) @@ -864,7 +864,7 @@ public class SettingsActivity extends SettingsDrawerActivity somethingChanged = setTileEnabled(new ComponentName(packageName, Settings.WifiDisplaySettingsActivity.class.getName()), - WifiDisplaySettings.isAvailable(this), isAdmin) + false/*WifiDisplaySettings.isAvailable(this)*/, isAdmin) || somethingChanged; if (UserHandle.MU_ENABLED && !isAdmin) { diff --git a/packages/apps/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/packages/apps/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java old mode 100644 new mode 100755 index 6ac8489..f0a5fad --- a/packages/apps/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/packages/apps/Settings/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -79,12 +79,12 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { controllers.add(new YFcamerafaceSwitchPreferenceController(context, "camera_face_switch")); controllers.add(new YFcameramirrorSwitchPreferenceController(context, "camera_mirror_switch")); controllers.add(new YFcamerarotationPreferenceController(context, "camera_rotation")); - final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController = - new BluetoothMasterSwitchPreferenceController( - context, Utils.getLocalBtManager(context), this, - (SettingsActivity) getActivity()); - lifecycle.addObserver(bluetoothPreferenceController); - controllers.add(bluetoothPreferenceController); + //final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController = + // new BluetoothMasterSwitchPreferenceController( + // context, Utils.getLocalBtManager(context), this, + // (SettingsActivity) getActivity()); + //lifecycle.addObserver(bluetoothPreferenceController); + //controllers.add(bluetoothPreferenceController); SmsMirroringFeatureProvider smsMirroringFeatureProvider = FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider(); @@ -111,13 +111,14 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @Override public void setListening(boolean listening) { if (listening) { - if (mNfcPreferenceController.isAvailable()) { - mSummaryLoader.setSummary(this, - mContext.getString(R.string.connected_devices_dashboard_summary)); - } else { - mSummaryLoader.setSummary(this, mContext.getString( - R.string.connected_devices_dashboard_no_nfc_summary)); - } + //if (mNfcPreferenceController.isAvailable()) { + // mSummaryLoader.setSummary(this, + // mContext.getString(R.string.connected_devices_dashboard_summary)); + //} else { + // mSummaryLoader.setSummary(this, mContext.getString( + // R.string.connected_devices_dashboard_no_nfc_summary)); + //} + mSummaryLoader.setSummary(this,"USB、Camera"); } } } @@ -152,7 +153,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { keys.add(NfcPreferenceController.KEY_TOGGLE_NFC); keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS); } - keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH); + //keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH); SmsMirroringFeatureProvider smsMirroringFeatureProvider = FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider(); diff --git a/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java b/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java old mode 100644 new mode 100755 index f7b17e3..2de8bbf --- a/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java @@ -183,7 +183,7 @@ public class SettingsGateway { PublicVolumeSettings.class.getName(), DevelopmentSettings.class.getName(), AndroidBeam.class.getName(), - WifiDisplaySettings.class.getName(), + //WifiDisplaySettings.class.getName(), PowerUsageSummary.class.getName(), AccountSyncSettings.class.getName(), AssistGestureSettings.class.getName(), diff --git a/packages/apps/Settings/src/com/android/settings/network/NetworkDashboardFragment.java b/packages/apps/Settings/src/com/android/settings/network/NetworkDashboardFragment.java index b4084ab..013f483 100755 --- a/packages/apps/Settings/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/packages/apps/Settings/src/com/android/settings/network/NetworkDashboardFragment.java @@ -98,8 +98,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements new AirplaneModePreferenceController(context, fragment); final MobilePlanPreferenceController mobilePlanPreferenceController = new MobilePlanPreferenceController(context, mobilePlanHost); - final WifiMasterSwitchPreferenceController wifiPreferenceController = - new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider); + //final WifiMasterSwitchPreferenceController wifiPreferenceController = + // new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider); final MobileNetworkPreferenceController mobileNetworkPreferenceController = new MobileNetworkPreferenceController(context); final VpnPreferenceController vpnPreferenceController = @@ -108,7 +108,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements if (lifecycle != null) { lifecycle.addObserver(airplaneModePreferenceController); lifecycle.addObserver(mobilePlanPreferenceController); - lifecycle.addObserver(wifiPreferenceController); + //lifecycle.addObserver(wifiPreferenceController); lifecycle.addObserver(mobileNetworkPreferenceController); lifecycle.addObserver(vpnPreferenceController); } @@ -120,7 +120,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements controllers.add(vpnPreferenceController); controllers.add(new ProxyPreferenceController(context)); controllers.add(mobilePlanPreferenceController); - controllers.add(wifiPreferenceController); + //controllers.add(wifiPreferenceController); controllers.add(new LTElistPreferenceController(context, "lte_module_list")); return controllers; } @@ -183,12 +183,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements @Override public void setListening(boolean listening) { if (listening) { - String summary = mContext.getString(R.string.wifi_settings_title); + String summary = "";//mContext.getString(R.string.wifi_settings_title); if (mMobileNetworkPreferenceController.isAvailable()) { final String mobileSettingSummary = mContext.getString( R.string.network_dashboard_summary_mobile); - summary = mContext.getString(R.string.join_many_items_middle, summary, - mobileSettingSummary); + summary = mobileSettingSummary;//mContext.getString(R.string.join_many_items_middle, summary, + //mobileSettingSummary); } final String dataUsageSettingSummary = mContext.getString( R.string.network_dashboard_summary_data_usage); @@ -237,7 +237,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements public List<String> getNonIndexableKeys(Context context) { List<String> keys = super.getNonIndexableKeys(context); // Remove master switch as a result - keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); + //keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); return keys; } };

最新回复(0)