Gaming mode: stop using masterswitch preference
have issues with layout on 11 and crashes settings also comment dynamic switch for now Change-Id: Id823786d1ca6a54151e91fc5f1b6b6a7cdebdbb6 Signed-off-by: DennySPb <dennyspb@gmail.com> Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -919,6 +919,8 @@
|
||||
<!-- Gaming mode -->
|
||||
<string name="gaming_mode_title">Gaming Mode</string>
|
||||
<string name="gaming_mode_summary">Customize gaming mode preferences</string>
|
||||
<string name="gaming_mode_enable_title">Enable Gaming Mode</string>
|
||||
<string name="gaming_mode_enable_summary">Master switch for Gaming Mode</string>
|
||||
<string name="gaming_mode_app_picker_title">Automatically turn on for these apps</string>
|
||||
<string name="add_gaming_mode_package_title">Add apps for Gaming mode</string>
|
||||
<string name="add_gaming_mode_package_summary">Gaming mode will turn on automatically when these apps are opened and turn off when they are closed</string>
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
android:summaryOff="@string/summary_dashboard_suggestions_disabled"
|
||||
android:defaultValue="true"/>
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
|
||||
android:key="gaming_mode_enabled"
|
||||
<Preference
|
||||
android:key="gaming_mode"
|
||||
android:icon="@drawable/ic_gaming_mode"
|
||||
android:fragment="com.cherish.settings.fragments.GamingMode"
|
||||
android:title="@string/gaming_mode_title"
|
||||
|
||||
@@ -19,22 +19,31 @@
|
||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
|
||||
android:title="@string/gaming_mode_title">
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="gaming_mode_enabled"
|
||||
android:title="@string/gaming_mode_enable_title"
|
||||
android:summary="@string/gaming_mode_enable_summary"
|
||||
android:defaultValue="false" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="gaming_mode_headsup_toggle"
|
||||
android:title="@string/gaming_mode_headsup_title"
|
||||
android:summary="@string/gaming_mode_headsup_summary"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="gaming_mode_hw_keys_toggle"
|
||||
android:title="@string/gaming_mode_hardware_keys_title"
|
||||
android:summary="@string/gaming_mode_hardware_keys_summary"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:defaultValue="false" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="gaming_mode_manual_brightness_toggle"
|
||||
android:title="@string/gaming_mode_brightness_title"
|
||||
android:summary="@string/gaming_mode_brightness_summary"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingListPreference
|
||||
@@ -43,6 +52,7 @@
|
||||
android:entries="@array/gaming_mode_ringer_entries"
|
||||
android:entryValues="@array/gaming_mode_ringer_values"
|
||||
android:defaultValue="0"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:summary="%s" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingListPreference
|
||||
@@ -51,15 +61,18 @@
|
||||
android:entries="@array/gaming_mode_notifications_entries"
|
||||
android:entryValues="@array/gaming_mode_notifications_values"
|
||||
android:defaultValue="3"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:summary="%s" />
|
||||
|
||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
<!-- <com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||
android:key="gaming_mode_dynamic_state"
|
||||
android:title="@string/gaming_mode_dynamic_title"
|
||||
android:summary="@string/gaming_mode_dynamic_summary"
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:defaultValue="false" />
|
||||
|
||||
-->
|
||||
<PreferenceCategory
|
||||
android:dependency="gaming_mode_enabled"
|
||||
android:title="@string/gaming_mode_app_picker_title"
|
||||
android:key="gamingmode_applications">
|
||||
<Preference
|
||||
|
||||
@@ -34,10 +34,6 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
|
||||
public class MiscSettings extends SettingsPreferenceFragment implements
|
||||
OnPreferenceChangeListener {
|
||||
|
||||
private static final String GAMING_MODE_ENABLED = "gaming_mode_enabled";
|
||||
|
||||
private SystemSettingMasterSwitchPreference mGamingMode;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
@@ -45,21 +41,10 @@ public class MiscSettings extends SettingsPreferenceFragment implements
|
||||
|
||||
addPreferencesFromResource(R.xml.cherish_settings_misc);
|
||||
|
||||
mGamingMode = (SystemSettingMasterSwitchPreference) findPreference(GAMING_MODE_ENABLED);
|
||||
mGamingMode.setChecked((Settings.System.getInt(getActivity().getContentResolver(),
|
||||
Settings.System.GAMING_MODE_ENABLED, 0) == 1));
|
||||
mGamingMode.setOnPreferenceChangeListener(this);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
if (preference == mGamingMode) {
|
||||
boolean value = (Boolean) newValue;
|
||||
Settings.System.putInt(getActivity().getContentResolver(),
|
||||
Settings.System.GAMING_MODE_ENABLED, value ? 1 : 0);
|
||||
return true;
|
||||
}
|
||||
public boolean onPreferenceChange(Preference preference, Object objValue) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ public class GamingMode extends SettingsPreferenceFragment
|
||||
// Get launch-able applications
|
||||
addPreferencesFromResource(R.xml.gaming_mode_settings);
|
||||
|
||||
mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.add_gaming_mode_package_summary);
|
||||
// mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.add_gaming_mode_package_summary);
|
||||
|
||||
final PreferenceScreen prefScreen = getPreferenceScreen();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user