C66 优化MDM功能,去掉设置wifi,蓝牙,数据开关的显示
diff --git a/packages/apps/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/packages/apps/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
old mode 100644
new mode 100755
index 5836945..577add7
--- a/packages/apps/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/packages/apps/Settings/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -32,6 +32,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import android.os.SystemProperties;//persist.sys.blueth
+import android.os.Bundle;
+import android.util.Log;
+import android.support.v7.preference.Preference;
/**
* This fragment contains all the advanced connection preferences(i.e, Bluetooth, NFC, USB..)
@@ -42,6 +46,27 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
static final String KEY_BLUETOOTH = "bluetooth_settings";
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ boolean isPrepaid = SystemProperties.get("persist.sys.blueth").equals("0") ? true : false;
+ if (!isPrepaid) {
+ Log.d(TAG, "removePreference ");
+ removePreferenceFromScreen(KEY_BLUETOOTH);
+ }
+ }
+ /**
+ * Removes the specified preference, if it exists.
+ * @param key the key for the Preference item
+ */
+ private void removePreferenceFromScreen(String key) {
+ final Preference preference = findPreference(key);
+ if (preference != null) {
+ getPreferenceScreen().removePreference(preference);
+ }
+ }
+
+
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED;
diff --git a/packages/apps/Settings/src/com/android/settings/network/MobileNetworkPreferenceController.java b/packages/apps/Settings/src/com/android/settings/network/MobileNetworkPreferenceController.java
old mode 100644
new mode 100755
index 8b74897..3724302
--- a/packages/apps/Settings/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/packages/apps/Settings/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -44,6 +44,7 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.List;
+import android.os.SystemProperties;
public class MobileNetworkPreferenceController extends AbstractPreferenceController
@@ -81,7 +82,8 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
@Override
public boolean isAvailable() {
- return !isUserRestricted() && !Utils.isWifiOnly(mContext);
+ return !isUserRestricted() && !Utils.isWifiOnly(mContext)&& "0".equals(SystemProperties.get("persist.sys.dataable"));
+ // return !isUserRestricted() && !Utils.isWifiOnly(mContext);
}
public boolean isUserRestricted() {
diff --git a/packages/apps/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java b/packages/apps/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
old mode 100644
new mode 100755
index 818b295..f541076
--- a/packages/apps/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -35,6 +35,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import android.os.SystemProperties;
public class ConfigureWifiSettings extends DashboardFragment {
@@ -129,7 +130,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
protected boolean isPageSearchEnabled(Context context) {
return context.getResources()
- .getBoolean(R.bool.config_show_wifi_settings);
+ .getBoolean(R.bool.config_show_wifi_settings) && "0".equals(SystemProperties.get("persist.sys.wifiable"));
}
};
}
diff --git a/packages/apps/Settings/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/packages/apps/Settings/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
old mode 100644
new mode 100755
index 8843d93..f21ac8f
--- a/packages/apps/Settings/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/packages/apps/Settings/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -30,6 +30,8 @@ import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
+import android.os.SystemProperties;//persist.sys.wifiable
+
public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
@@ -57,7 +59,7 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont
@Override
public boolean isAvailable() {
- return mContext.getResources().getBoolean(R.bool.config_show_wifi_settings);
+ return mContext.getResources().getBoolean(R.bool.config_show_wifi_settings)&& "0".equals(SystemProperties.get("persist.sys.wifiable"));
}
@Override
diff --git a/packages/apps/Settings/src/com/android/settings/wifi/WifiSettings.java b/packages/apps/Settings/src/com/android/settings/wifi/WifiSettings.java
old mode 100644
new mode 100755
index 46417ec..62770e4
--- a/packages/apps/Settings/src/com/android/settings/wifi/WifiSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/wifi/WifiSettings.java
@@ -77,6 +77,7 @@ import com.android.settingslib.wifi.WifiTrackerFactory;
import java.util.ArrayList;
import java.util.List;
+import android.os.SystemProperties;
/**
* Two types of UI are provided here.
@@ -1174,7 +1175,7 @@ public class WifiSettings extends RestrictedSettingsFragment
final Resources res = context.getResources();
// Add fragment title if we are showing this fragment
- if (res.getBoolean(R.bool.config_show_wifi_settings)) {
+ if (res.getBoolean(R.bool.config_show_wifi_settings)&& "0".equals(SystemProperties.get("persist.sys.wifiable"))) {
SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.wifi_settings);
data.screenTitle = res.getString(R.string.wifi_settings);