Commit 0b485bb5 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review

Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev

parents 991fa264 a48c78cc
......@@ -363,11 +363,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>
......@@ -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 =
......@@ -295,8 +294,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mForceResizable;
private SwitchPreference mEnableFreeformSupport;
private SwitchPreference mColorTemperaturePreference;
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
......@@ -437,7 +434,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);
......@@ -699,7 +695,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateSimulateColorSpace();
updateUSBAudioOptions();
updateForceResizableOptions();
updateEnableFreeformWindowsSupportOptions();
updateWebViewMultiprocessOptions();
updateWebViewProviderOptions();
updateOemUnlockOptions();
......@@ -1353,17 +1348,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(),
......@@ -1908,8 +1892,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())) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment