PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wale Ogunwale
2016-02-23 02:27:14 +00:00
committed by Android (Google) Code Review
parent 991fa2643e a48c78ccfc
commit 0b485bb523
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -363,11 +363,6 @@
android:key="force_resizable_activities" android:key="force_resizable_activities"
android:title="@string/force_resizable_activities" android:title="@string/force_resizable_activities"
android:summary="@string/force_resizable_activities_summary"/> 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> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

18
src/com/android/settings/DevelopmentSettings.java
View File

@@ -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 MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
private static final String KEY_COLOR_MODE = "color_mode"; private static final String KEY_COLOR_MODE = "color_mode";
private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities"; 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 COLOR_TEMPERATURE_KEY = "color_temperature";
private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY = private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
@@ -295,8 +294,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mForceResizable; private SwitchPreference mForceResizable;
private SwitchPreference mEnableFreeformSupport;
private SwitchPreference mColorTemperaturePreference; private SwitchPreference mColorTemperaturePreference;
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
@@ -437,7 +434,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE); mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY); mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY); mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
mEnableFreeformSupport = findAndInitSwitchPref(ENABLE_FREEFORM_SUPPORT_KEY);
mImmediatelyDestroyActivities = (SwitchPreference) findPreference( mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
IMMEDIATELY_DESTROY_ACTIVITIES_KEY); IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
@@ -699,7 +695,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateSimulateColorSpace(); updateSimulateColorSpace();
updateUSBAudioOptions(); updateUSBAudioOptions();
updateForceResizableOptions(); updateForceResizableOptions();
updateEnableFreeformWindowsSupportOptions();
updateWebViewMultiprocessOptions(); updateWebViewMultiprocessOptions();
updateWebViewProviderOptions(); updateWebViewProviderOptions();
updateOemUnlockOptions(); updateOemUnlockOptions();
@@ -1353,17 +1348,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mForceResizable.isChecked() ? 1 : 0); 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() { private void updateForceRtlOptions() {
updateSwitchPreference(mForceRtlLayout, updateSwitchPreference(mForceRtlLayout,
Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.getInt(getActivity().getContentResolver(),
@@ -1908,8 +1892,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeUSBAudioOptions(); writeUSBAudioOptions();
} else if (preference == mForceResizable) { } else if (preference == mForceResizable) {
writeForceResizableOptions(); writeForceResizableOptions();
} else if (preference == mEnableFreeformSupport){
writeEnableFreeformWindowsSupportOptions();
} else if (INACTIVE_APPS_KEY.equals(preference.getKey())) { } else if (INACTIVE_APPS_KEY.equals(preference.getKey())) {
startInactiveAppsFragment(); startInactiveAppsFragment();
} else if (BACKGROUND_CHECK_KEY.equals(preference.getKey())) { } else if (BACKGROUND_CHECK_KEY.equals(preference.getKey())) {