Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a5e32a6 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev

parents cd207ad4 075cb30d

src/com/android/settings/DevelopmentSettings.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -706,8 +706,8 @@ public class DevelopmentSettings extends PreferenceFragment 
    }

    }





    private void updateOverlayDisplayDevicesOptions() {

    private void updateOverlayDisplayDevicesOptions() {

        String value = Settings.System.getString(getActivity().getContentResolver(),

        String value = Settings.Global.getString(getActivity().getContentResolver(),

                Settings.Secure.OVERLAY_DISPLAY_DEVICES);

                Settings.Global.OVERLAY_DISPLAY_DEVICES);

        if (value == null) {

        if (value == null) {

            value = "";

            value = "";

        }

        }
@@ -725,8 +725,8 @@ public class DevelopmentSettings extends PreferenceFragment 
    }

    }





    private void writeOverlayDisplayDevicesOptions(Object newValue) {

    private void writeOverlayDisplayDevicesOptions(Object newValue) {

        Settings.System.putString(getActivity().getContentResolver(),

        Settings.Global.putString(getActivity().getContentResolver(),

                Settings.Secure.OVERLAY_DISPLAY_DEVICES, (String)newValue);

                Settings.Global.OVERLAY_DISPLAY_DEVICES, (String)newValue);

        updateOverlayDisplayDevicesOptions();

        updateOverlayDisplayDevicesOptions();

    }

    }