From 064a312c8c2467e0fbb6418e133d3c1fe2f6a605 Mon Sep 17 00:00:00 2001 From: Trishiraj Date: Mon, 14 Nov 2022 00:08:27 +0700 Subject: [PATCH] Cherish: Add toggles for new reticker styles[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-vi-rVN/cherish_strings.xml | 4 ++++ res/values/cherish_strings.xml | 4 ++++ res/xml/cherish_settings_notifications.xml | 14 ++++++++++++++ .../cherish/settings/fragments/MiscSettings.java | 4 +++- .../settings/fragments/NotificationSettings.java | 13 +++++++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/res/values-vi-rVN/cherish_strings.xml b/res/values-vi-rVN/cherish_strings.xml index b33eb38..ec84a11 100644 --- a/res/values-vi-rVN/cherish_strings.xml +++ b/res/values-vi-rVN/cherish_strings.xml @@ -550,6 +550,10 @@ reTicker Thay thế thông báo nổi bằng thông báo kiểu mới được thiết kế lại mỏng và ít xâm lấn hơn + Thay thế reTicker + Sử dụng bố cục thay thế cho reticker lấy cảm hứng từ ios + Hoạt ảnh reTicker thay thế + Sử dụng một hoạt ảnh khác cho reticker (được bật theo mặc định trên reticker thay thế) Sử dụng nền màu ứng dụng Thay thế màu nền reTicker bằng màu chính của ứng dụng thông báo diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 83be2d4..bffdbc2 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -644,6 +644,10 @@ reTicker reTicker Replace heads-up notification with slim and less invasive version of redesigned ticker + Alternative reTicker + Use an alternative layout for reticker that is inspired from ios + Alternative reTicker animation + Use a different animation for reticker (enabled by default on alternative reTicker) Use app colored background Replace reTicker background color using notification app main color diff --git a/res/xml/cherish_settings_notifications.xml b/res/xml/cherish_settings_notifications.xml index bd05e97..0a92b19 100644 --- a/res/xml/cherish_settings_notifications.xml +++ b/res/xml/cherish_settings_notifications.xml @@ -95,6 +95,20 @@ android:title="@string/reticker_colored_title" android:summary="@string/reticker_colored_summary" android:defaultValue="false" /> + + + + diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java index df93e23..0a389c9 100644 --- a/src/com/cherish/settings/fragments/MiscSettings.java +++ b/src/com/cherish/settings/fragments/MiscSettings.java @@ -32,6 +32,8 @@ import java.util.HashSet; import android.content.pm.PackageManager.NameNotFoundException; import com.android.settings.SettingsPreferenceFragment; +import com.cherish.settings.preferences.SystemSettingSwitchPreference; +import com.cherish.settings.preferences.SystemSettingEditTextPreference; import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference; import com.cherish.settings.preferences.SystemSettingListPreference; import com.cherish.settings.preferences.SecureSettingSwitchPreference; @@ -94,7 +96,7 @@ public class MiscSettings extends SettingsPreferenceFragment implements boolean value = (Boolean) newValue; SystemProperties.set(SYS_PHOTOS_SPOOF, value ? "true" : "false"); return true; - } + } return false; } diff --git a/src/com/cherish/settings/fragments/NotificationSettings.java b/src/com/cherish/settings/fragments/NotificationSettings.java index 1dd2519..dcfa964 100644 --- a/src/com/cherish/settings/fragments/NotificationSettings.java +++ b/src/com/cherish/settings/fragments/NotificationSettings.java @@ -39,9 +39,13 @@ public class NotificationSettings extends SettingsPreferenceFragment implements private static final String INCALL_VIB_OPTIONS = "incall_vib_options"; private static final String ALERT_SLIDER_PREF = "alert_slider_notifications"; + + private static final String NEW_RETICKER = "new_reticker"; + private static final String NEW_RETICKER_ANIMATION = "new_reticker_animation"; private Preference mChargingLeds; private Preference mAlertSlider; + private SystemSettingSwitchPreference mNewReticker, mNewRetickerAnimation; @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -68,11 +72,20 @@ public class NotificationSettings extends SettingsPreferenceFragment implements if (!CherishUtils.isVoiceCapable(getActivity())) { prefScreen.removePreference(incallVibCategory); } + + mNewReticker = (SystemSettingSwitchPreference) findPreference(NEW_RETICKER); + mNewReticker.setOnPreferenceChangeListener(this); + mNewRetickerAnimation = (SystemSettingSwitchPreference) findPreference(NEW_RETICKER_ANIMATION); + mNewRetickerAnimation.setOnPreferenceChangeListener(this); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { + if (preference == mNewReticker || preference == mNewRetickerAnimation) { + CherishUtils.showSystemUiRestartDialog(getActivity()); + return true; + } return false; }