From fcd07ad550265c9b607ce2002552b3d500dbed07 Mon Sep 17 00:00:00 2001 From: AshutoshSundresh Date: Tue, 23 Feb 2021 08:45:05 +0000 Subject: [PATCH] Cherish: Screen Off FOD (2/2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: TheScarastic Change-Id: I341b1dcbc11368e56f6e56d447d5cc7e7ce8d1c1 Signed-off-by: Ayan Mukherjee Signed-off-by: Hưng Phan --- res/values/cherish_strings.xml | 5 +++++ res/xml/cherish_settings_lockscreen.xml | 12 ++++++++++++ .../fragments/LockScreenSettings.java | 19 ++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index a3c1c97..6321a56 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -1132,4 +1132,9 @@ Qs clock Display an oos like clock on qs + + + Fingerprint On Display + Screen off FOD + Allows unlocking the device without having to wake up the screen first diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml index 1e5922b..12db749 100644 --- a/res/xml/cherish_settings_lockscreen.xml +++ b/res/xml/cherish_settings_lockscreen.xml @@ -269,6 +269,18 @@ android:title="@string/keyguard_show_battery_title" android:summary="@string/keyguard_show_battery_summary" android:fragment="com.cherish.settings.fragments.KeygaurdBatteryBar" /> + + + + + + diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java index 103ff2e..efd4315 100644 --- a/src/com/cherish/settings/fragments/LockScreenSettings.java +++ b/src/com/cherish/settings/fragments/LockScreenSettings.java @@ -34,7 +34,7 @@ import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; - +import android.os.SystemProperties; import android.provider.Settings; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -54,6 +54,8 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements private static final String DATE_FONT_SIZE = "lockdate_font_size"; private static final String LOCKOWNER_FONT_SIZE = "lockowner_font_size"; private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule"; + private static final String LOCKSCREEN_CATEGORY = "lockscreen_category"; + private ContentResolver mResolver; static final int MODE_DISABLED = 0; static final int MODE_NIGHT = 1; @@ -76,6 +78,21 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements final PreferenceScreen prefScreen = getPreferenceScreen(); Resources resources = getResources(); + PreferenceCategory overallPreferences = (PreferenceCategory) findPreference("fod_category"); + mResolver = getActivity().getContentResolver(); + + boolean enableScreenOffFOD = getContext().getResources(). + getBoolean(com.android.internal.R.bool.config_supportScreenOffFod); + Preference ScreenOffFODPref = (Preference) findPreference("fod_gesture"); + + if (!enableScreenOffFOD){ + overallPreferences.removePreference(ScreenOffFODPref); + } + + if (!getResources().getBoolean(com.android.internal.R.bool.config_supportsInDisplayFingerprint)) { + prefScreen.removePreference(findPreference("fod_category")); + } + // Lock Clock Size mClockFontSize = (CustomSeekBarPreference) findPreference(CLOCK_FONT_SIZE); mClockFontSize.setValue(Settings.System.getInt(getContentResolver(),