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

Commit a48c78cc authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Revert "Add developer option for freeform window support (2/2)" 

This reverts commit 292b9fd2.

Will add back later and limit to non-user builds.

Bug: 27295415
Bug: 25276672
Bug: 24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
parent 60df76b1

res/xml/development_prefs.xml

+0 −5
Original line number Diff line number Diff line
@@ -370,11 +370,6 @@ 
            android:key="force_resizable_activities"

            android:title="@string/force_resizable_activities"

            android:summary="@string/force_resizable_activities_summary"/>



        <SwitchPreference

                android:key="enable_freeform_support"

                android:title="@string/enable_freeform_support"

                android:summary="@string/enable_freeform_support_summary"/>

     </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/DevelopmentSettings.java

+0 −18
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    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 =
@@ -298,8 +297,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 


    private SwitchPreference mForceResizable;



    private SwitchPreference mEnableFreeformSupport;



    private SwitchPreference mColorTemperaturePreference;



    private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
@@ -440,7 +437,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);

        mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);

        mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);

        mEnableFreeformSupport = findAndInitSwitchPref(ENABLE_FREEFORM_SUPPORT_KEY);



        mImmediatelyDestroyActivities = (SwitchPreference) findPreference(

                IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
@@ -723,7 +719,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        updateSimulateColorSpace();

        updateUSBAudioOptions();

        updateForceResizableOptions();

        updateEnableFreeformWindowsSupportOptions();

        updateWebViewMultiprocessOptions();

        updateWebViewProviderOptions();

        updateOemUnlockOptions();
@@ -1377,17 +1372,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
                mForceResizable.isChecked() ? 1 : 0);

    }



    private void updateEnableFreeformWindowsSupportOptions() {

        updateSwitchPreference(mEnableFreeformSupport, Settings.Global.getInt(getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0);

    }



    private void writeEnableFreeformWindowsSupportOptions() {

        Settings.Global.putInt(getContentResolver(),

                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,

                mEnableFreeformSupport.isChecked() ? 1 : 0);

    }



    private void updateForceRtlOptions() {

        updateSwitchPreference(mForceRtlLayout,

                Settings.Global.getInt(getActivity().getContentResolver(),
@@ -1932,8 +1916,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            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())) {