resolve merge conflicts of c408ab3de6 to nyc-dev

Change-Id: I647195694e4c2c8dd886246143ef9f9ac7a79a62

diff --cc res/xml/development_prefs.xml
Simple merge

diff --cc src/com/android/settings/DevelopmentSettings.java
index f33b23d,ea9e80e..186e751
--- 1/src/com/android/settings/DevelopmentSettings.java
--- 2/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@@ -174,17 -154,8 +174,16 @@@ public class DevelopmentSettings extend
      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 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 KEY_COLOR_MODE = "color_mode";
 +    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
 +    private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support";
 +    private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
 +
 +    private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
 +                                    "bluetooth_disable_absolute_volume";
 +    private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY =
 +                                    "persist.bluetooth.disableabsvol";
  
      private static final String INACTIVE_APPS_KEY = "inactive_apps";
  
@@@ -249,9 -216,7 +248,8 @@@
      private SwitchPreference mWifiDisplayCertification;
      private SwitchPreference mWifiVerboseLogging;
      private SwitchPreference mWifiAggressiveHandover;
-     private SwitchPreference mLegacyDhcpClient;
      private SwitchPreference mMobileDataAlwaysOn;
 +    private SwitchPreference mBluetoothDisableAbsVolume;
  
      private SwitchPreference mWifiAllowScansWithTraffic;
      private SwitchPreference mStrictMode;
@@@ -1393,28 -1232,6 +1389,16 @@@
          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() {
 +        updateSwitchPreference(mBluetoothDisableAbsVolume,
 +                SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false));
 +    }
 +
 +    private void writeBluetoothDisableAbsVolumeOptions() {
 +        SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
 +                mBluetoothDisableAbsVolume.isChecked() ? "true" : "false");
 +    }
 +
      private void updateMobileDataAlwaysOnOptions() {
          updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
                  getActivity().getContentResolver(),
@@@ -1886,26 -1685,14 +1870,24 @@@
              writeWifiAggressiveHandoverOptions();
          } else if (preference == mWifiAllowScansWithTraffic) {
              writeWifiAllowScansWithTrafficOptions();
-         } else if (preference == mLegacyDhcpClient) {
-             writeLegacyDhcpClientOptions();
          } else if (preference == mMobileDataAlwaysOn) {
              writeMobileDataAlwaysOnOptions();
 +        } else if (preference == mColorTemperaturePreference) {
 +            writeColorTemperature();
          } else if (preference == mUSBAudio) {
              writeUSBAudioOptions();
 +        } else if (preference == mForceResizable) {
 +            writeForceResizableOptions();
 +        } else if (preference == mEnableFreeformSupport){
 +            writeEnableFreeformWindowsSupportOptions();
          } else if (INACTIVE_APPS_KEY.equals(preference.getKey())) {
              startInactiveAppsFragment();
 +        } else if (BACKGROUND_CHECK_KEY.equals(preference.getKey())) {
 +            startBackgroundCheckFragment();
 +        } else if (preference == mBluetoothDisableAbsVolume) {
 +            writeBluetoothDisableAbsVolumeOptions();
          } else {
 -            return super.onPreferenceTreeClick(preferenceScreen, preference);
 +            return super.onPreferenceTreeClick(preference);
          }
  
          return false;