PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of c408ab3de6 to nyc-dev

Browse Source 
Change-Id: I647195694e4c2c8dd886246143ef9f9ac7a79a62
This commit is contained in:
Lorenzo Colitti
2016-02-17 22:27:56 +09:00
parent 4d2186a9b3 c408ab3de6
commit 6ef09978ad
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -162,11 +162,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"

18
src/com/android/settings/DevelopmentSettings.java
View File

@@ -174,7 +174,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";
private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities"; private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
@@ -249,7 +248,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 mBluetoothDisableAbsVolume; private SwitchPreference mBluetoothDisableAbsVolume;
@@ -413,7 +411,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);
@@ -705,7 +702,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
updateWifiVerboseLoggingOptions(); updateWifiVerboseLoggingOptions();
updateWifiAggressiveHandoverOptions(); updateWifiAggressiveHandoverOptions();
updateWifiAllowScansWithTrafficOptions(); updateWifiAllowScansWithTrafficOptions();
updateLegacyDhcpClientOptions();
updateMobileDataAlwaysOnOptions(); updateMobileDataAlwaysOnOptions();
updateSimulateColorSpace(); updateSimulateColorSpace();
updateUSBAudioOptions(); updateUSBAudioOptions();
@@ -1393,18 +1389,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 updateBluetoothDisableAbsVolumeOptions() { private void updateBluetoothDisableAbsVolumeOptions() {
updateSwitchPreference(mBluetoothDisableAbsVolume, updateSwitchPreference(mBluetoothDisableAbsVolume,
SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false)); SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false));
@@ -1886,8 +1870,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 == mColorTemperaturePreference) { } else if (preference == mColorTemperaturePreference) {