psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Cherish:Allow customizing footer text [2/2]"

Browse Source 
This reverts commit fe88dd2014.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-06-16 22:56:39 +07:00
parent d4e6f951e4
commit 45c73083bd
3 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/cherish_strings.xml
View File

@@ -696,8 +696,6 @@
<!-- QS Footer Text --> <!-- QS Footer Text -->
<string name="qs_footer_text_title">QS footer text</string> <string name="qs_footer_text_title">QS footer text</string>
<string name="qs_footer_text_summary">Display text at bottom of QS panel</string> <string name="qs_footer_text_summary">Display text at bottom of QS panel</string>
<string name="qs_footer_text_string_title">Customize footer text</string>
<string name="qs_footer_text_string_summary">Set to empty for default #KeepTheLove</string>
<!-- QS Header data uasge --> <!-- QS Header data uasge -->
<string name="qs_datausage_title">Data usage in QS Header</string> <string name="qs_datausage_title">Data usage in QS Header</string>

9
res/xml/cherish_settings_quicksettings.xml
View File

@@ -54,15 +54,6 @@
android:summary="@string/qs_footer_text_summary" android:summary="@string/qs_footer_text_summary"
android:defaultValue="false"/> android:defaultValue="false"/>
<!-- QS footer text string -->
<com.cherish.settings.preferences.SystemSettingEditTextPreference
android:key="footer_text_string"
android:icon="@drawable/ic_edit1"
android:title="@string/qs_footer_text_string_title"
android:summary="@string/qs_footer_text_string_summary"
android:dependency="omni_footer_text_show"
android:defaultValue="#KeeptheLove" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference <com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="qs_edit_toggle" android:key="qs_edit_toggle"
android:icon="@drawable/ic_edit" android:icon="@drawable/ic_edit"

27
src/com/cherish/settings/fragments/QuickSettings.java
View File

@@ -32,10 +32,8 @@ import java.util.ArrayList;
public class QuickSettings extends SettingsPreferenceFragment implements public class QuickSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener { OnPreferenceChangeListener {
private static final String FOOTER_TEXT_STRING = "footer_text_string";
private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header"; private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
private SystemSettingEditTextPreference mFooterString;
private SystemSettingMasterSwitchPreference mCustomHeader; private SystemSettingMasterSwitchPreference mCustomHeader;
@Override @Override
@@ -52,35 +50,12 @@ public class QuickSettings extends SettingsPreferenceFragment implements
Settings.System.STATUS_BAR_CUSTOM_HEADER, 0); Settings.System.STATUS_BAR_CUSTOM_HEADER, 0);
mCustomHeader.setChecked(qsHeader != 0); mCustomHeader.setChecked(qsHeader != 0);
mCustomHeader.setOnPreferenceChangeListener(this); mCustomHeader.setOnPreferenceChangeListener(this);
mFooterString = (SystemSettingEditTextPreference) findPreference(FOOTER_TEXT_STRING);
mFooterString.setOnPreferenceChangeListener(this);
String footerString = Settings.System.getString(getContentResolver(),
FOOTER_TEXT_STRING);
if (footerString != null && footerString != "")
mFooterString.setText(footerString);
else {
mFooterString.setText("#KeepTheLove");
Settings.System.putString(getActivity().getContentResolver(),
Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
}
} }
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver resolver = getActivity().getContentResolver(); ContentResolver resolver = getActivity().getContentResolver();
if (preference == mFooterString) { if (preference == mCustomHeader) {
String value = (String) newValue;
if (value != "" && value != null)
Settings.System.putString(getActivity().getContentResolver(),
Settings.System.FOOTER_TEXT_STRING, value);
else {
mFooterString.setText("#KeepTheLove");
Settings.System.putString(getActivity().getContentResolver(),
Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
}
return true;
} else if (preference == mCustomHeader) {
boolean header = (Boolean) newValue; boolean header = (Boolean) newValue;
Settings.System.putInt(resolver, Settings.System.putInt(resolver,
Settings.System.STATUS_BAR_CUSTOM_HEADER, header ? 1 : 0); Settings.System.STATUS_BAR_CUSTOM_HEADER, header ? 1 : 0);