Hide the legacy DHCP client option, since it no longer works.
This only removes the option from the Developer Settings screen. Future changes will need to: - Remove the localized strings. - Remove the settings constants in SettingsLib. Bug: 26991160 Change-Id: I1770bb1c206818317845ff5aa340b2a9a76118b5
This commit is contained in:
@@ -139,11 +139,6 @@
|
|||||||
android:title="@string/wifi_allow_scan_with_traffic"
|
android:title="@string/wifi_allow_scan_with_traffic"
|
||||||
android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
|
android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
|
||||||
|
|
||||||
<SwitchPreference
|
|
||||||
android:key="legacy_dhcp_client"
|
|
||||||
android:title="@string/legacy_dhcp_client"
|
|
||||||
android:summary="@string/legacy_dhcp_client_summary"/>
|
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="mobile_data_always_on"
|
android:key="mobile_data_always_on"
|
||||||
android:title="@string/mobile_data_always_on"
|
android:title="@string/mobile_data_always_on"
|
||||||
|
@@ -154,7 +154,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
|
private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
|
||||||
private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
|
private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
|
||||||
private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
|
private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
|
||||||
private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";
|
|
||||||
private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
|
private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
|
||||||
private static final String KEY_COLOR_MODE = "color_mode";
|
private static final String KEY_COLOR_MODE = "color_mode";
|
||||||
|
|
||||||
@@ -217,7 +216,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
private SwitchPreference mWifiDisplayCertification;
|
private SwitchPreference mWifiDisplayCertification;
|
||||||
private SwitchPreference mWifiVerboseLogging;
|
private SwitchPreference mWifiVerboseLogging;
|
||||||
private SwitchPreference mWifiAggressiveHandover;
|
private SwitchPreference mWifiAggressiveHandover;
|
||||||
private SwitchPreference mLegacyDhcpClient;
|
|
||||||
private SwitchPreference mMobileDataAlwaysOn;
|
private SwitchPreference mMobileDataAlwaysOn;
|
||||||
|
|
||||||
private SwitchPreference mWifiAllowScansWithTraffic;
|
private SwitchPreference mWifiAllowScansWithTraffic;
|
||||||
@@ -372,7 +370,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
|
mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
|
||||||
mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
|
mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
|
||||||
mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
|
mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
|
||||||
mLegacyDhcpClient = findAndInitSwitchPref(WIFI_LEGACY_DHCP_CLIENT_KEY);
|
|
||||||
mMobileDataAlwaysOn = findAndInitSwitchPref(MOBILE_DATA_ALWAYS_ON);
|
mMobileDataAlwaysOn = findAndInitSwitchPref(MOBILE_DATA_ALWAYS_ON);
|
||||||
mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
|
mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
|
||||||
mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
|
mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
|
||||||
@@ -624,7 +621,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
updateWifiVerboseLoggingOptions();
|
updateWifiVerboseLoggingOptions();
|
||||||
updateWifiAggressiveHandoverOptions();
|
updateWifiAggressiveHandoverOptions();
|
||||||
updateWifiAllowScansWithTrafficOptions();
|
updateWifiAllowScansWithTrafficOptions();
|
||||||
updateLegacyDhcpClientOptions();
|
|
||||||
updateMobileDataAlwaysOnOptions();
|
updateMobileDataAlwaysOnOptions();
|
||||||
updateSimulateColorSpace();
|
updateSimulateColorSpace();
|
||||||
updateUSBAudioOptions();
|
updateUSBAudioOptions();
|
||||||
@@ -1236,18 +1232,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
|
mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateLegacyDhcpClientOptions() {
|
|
||||||
updateSwitchPreference(mLegacyDhcpClient, Settings.Global.getInt(
|
|
||||||
getActivity().getContentResolver(),
|
|
||||||
Settings.Global.LEGACY_DHCP_CLIENT, 0) != 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void writeLegacyDhcpClientOptions() {
|
|
||||||
Settings.Global.putInt(getActivity().getContentResolver(),
|
|
||||||
Settings.Global.LEGACY_DHCP_CLIENT,
|
|
||||||
mLegacyDhcpClient.isChecked() ? 1 : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateMobileDataAlwaysOnOptions() {
|
private void updateMobileDataAlwaysOnOptions() {
|
||||||
updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
|
updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
|
||||||
getActivity().getContentResolver(),
|
getActivity().getContentResolver(),
|
||||||
@@ -1701,8 +1685,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
|||||||
writeWifiAggressiveHandoverOptions();
|
writeWifiAggressiveHandoverOptions();
|
||||||
} else if (preference == mWifiAllowScansWithTraffic) {
|
} else if (preference == mWifiAllowScansWithTraffic) {
|
||||||
writeWifiAllowScansWithTrafficOptions();
|
writeWifiAllowScansWithTrafficOptions();
|
||||||
} else if (preference == mLegacyDhcpClient) {
|
|
||||||
writeLegacyDhcpClientOptions();
|
|
||||||
} else if (preference == mMobileDataAlwaysOn) {
|
} else if (preference == mMobileDataAlwaysOn) {
|
||||||
writeMobileDataAlwaysOnOptions();
|
writeMobileDataAlwaysOnOptions();
|
||||||
} else if (preference == mUSBAudio) {
|
} else if (preference == mUSBAudio) {
|
||||||
|
Reference in New Issue
Block a user