From 8392239373f199254b8780422924ce0adfe8006f Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Mon, 16 Dec 2019 16:28:44 -0500 Subject: [PATCH] Cherish:Add QS pull down with one finger [2/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hưng Phan --- res/values/cherish_arrays.xml | 14 ++++++++++++++ res/values/cherish_strings.xml | 6 ++++++ res/xml/cherish_settings_quicksettings.xml | 7 +++++++ .../settings/fragments/QuickSettings.java | 19 +++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml index d043c19..e8c3d81 100644 --- a/res/values/cherish_arrays.xml +++ b/res/values/cherish_arrays.xml @@ -60,4 +60,18 @@ 900000 1200000 + + + + @string/quick_pulldown_none + @string/quick_pulldown_right + @string/quick_pulldown_left + + + + 0 + 1 + 2 + + diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index c70d374..95ff91f 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -225,4 +225,10 @@ 15 minutes 20 minutes + + Quick QS pulldown + Disabled + Pulldown statusbar from right side + Pulldown statusbar from left side + diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml index 31738e9..086291d 100644 --- a/res/xml/cherish_settings_quicksettings.xml +++ b/res/xml/cherish_settings_quicksettings.xml @@ -26,6 +26,13 @@ android:title="@string/quick_settings_vibrate_title" android:summary="@string/quick_settings_vibrate_summary" android:defaultValue="false"/> + + diff --git a/src/com/cherish/settings/fragments/QuickSettings.java b/src/com/cherish/settings/fragments/QuickSettings.java index 2d842d1..6c9a689 100644 --- a/src/com/cherish/settings/fragments/QuickSettings.java +++ b/src/com/cherish/settings/fragments/QuickSettings.java @@ -36,6 +36,8 @@ import java.util.ArrayList; @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class QuickSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { + + private ListPreference mQuickPulldown; @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -44,11 +46,28 @@ public class QuickSettings extends SettingsPreferenceFragment implements PreferenceScreen prefScreen = getPreferenceScreen(); ContentResolver resolver = getActivity().getContentResolver(); + + int qpmode = Settings.System.getIntForUser(getContentResolver(), + Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0, UserHandle.USER_CURRENT); + mQuickPulldown = (ListPreference) findPreference("status_bar_quick_qs_pulldown"); + mQuickPulldown.setValue(String.valueOf(qpmode)); + mQuickPulldown.setSummary(mQuickPulldown.getEntry()); + mQuickPulldown.setOnPreferenceChangeListener(this); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { ContentResolver resolver = getActivity().getContentResolver(); + if (preference == mQuickPulldown) { + int value = Integer.parseInt((String) newValue); + Settings.System.putIntForUser(resolver, + Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, value, + UserHandle.USER_CURRENT); + int index = mQuickPulldown.findIndexOfValue((String) newValue); + mQuickPulldown.setSummary( + mQuickPulldown.getEntries()[index]); + return true; + } return false; }