am 6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev

* commit '6a5e32a658ac62e72092e3b5d8fb3b99cc4b5158':
  Move OVERLAY_DISPLAY_DEVICES to Global.
This commit is contained in:
Jeff Brown
2012-09-25 17:05:50 -07:00
committed by Android Git Automerger

View File

@@ -706,8 +706,8 @@ public class DevelopmentSettings extends PreferenceFragment
}
private void updateOverlayDisplayDevicesOptions() {
String value = Settings.System.getString(getActivity().getContentResolver(),
Settings.Secure.OVERLAY_DISPLAY_DEVICES);
String value = Settings.Global.getString(getActivity().getContentResolver(),
Settings.Global.OVERLAY_DISPLAY_DEVICES);
if (value == null) {
value = "";
}
@@ -725,8 +725,8 @@ public class DevelopmentSettings extends PreferenceFragment
}
private void writeOverlayDisplayDevicesOptions(Object newValue) {
Settings.System.putString(getActivity().getContentResolver(),
Settings.Secure.OVERLAY_DISPLAY_DEVICES, (String)newValue);
Settings.Global.putString(getActivity().getContentResolver(),
Settings.Global.OVERLAY_DISPLAY_DEVICES, (String)newValue);
updateOverlayDisplayDevicesOptions();
}