Cherish: Screen Off FOD (2/2)
Co-authored-by: TheScarastic <warabhishek@gmail.com> Change-Id: I341b1dcbc11368e56f6e56d447d5cc7e7ce8d1c1 Signed-off-by: Ayan Mukherjee <mukherjeeayan725@gmail.com> Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
committed by
Hưng Phan
parent
af65a3a287
commit
fcd07ad550
@@ -1132,4 +1132,9 @@
|
|||||||
<!-- Qs Clock -->
|
<!-- Qs Clock -->
|
||||||
<string name="oos_qsclock">Qs clock</string>
|
<string name="oos_qsclock">Qs clock</string>
|
||||||
<string name="oos_qsclock_summary">Display an oos like clock on qs</string>
|
<string name="oos_qsclock_summary">Display an oos like clock on qs</string>
|
||||||
|
|
||||||
|
<!-- Screen off fod -->
|
||||||
|
<string name="lockscreen_fod_category">Fingerprint On Display</string>
|
||||||
|
<string name="fod_gesture_title">Screen off FOD</string>
|
||||||
|
<string name="fod_gesture_summary">Allows unlocking the device without having to wake up the screen first</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -269,6 +269,18 @@
|
|||||||
android:title="@string/keyguard_show_battery_title"
|
android:title="@string/keyguard_show_battery_title"
|
||||||
android:summary="@string/keyguard_show_battery_summary"
|
android:summary="@string/keyguard_show_battery_summary"
|
||||||
android:fragment="com.cherish.settings.fragments.KeygaurdBatteryBar" />
|
android:fragment="com.cherish.settings.fragments.KeygaurdBatteryBar" />
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="fod_category"
|
||||||
|
android:title="@string/lockscreen_fod_category">
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||||
|
android:key="fod_gesture"
|
||||||
|
android:title="@string/fod_gesture_title"
|
||||||
|
android:summary="@string/fod_gesture_summary"
|
||||||
|
android:defaultValue="false" />
|
||||||
|
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import androidx.preference.ListPreference;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceCategory;
|
import androidx.preference.PreferenceCategory;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import android.os.SystemProperties;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.SettingsPreferenceFragment;
|
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 DATE_FONT_SIZE = "lockdate_font_size";
|
||||||
private static final String LOCKOWNER_FONT_SIZE = "lockowner_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 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_DISABLED = 0;
|
||||||
static final int MODE_NIGHT = 1;
|
static final int MODE_NIGHT = 1;
|
||||||
@@ -76,6 +78,21 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
|||||||
final PreferenceScreen prefScreen = getPreferenceScreen();
|
final PreferenceScreen prefScreen = getPreferenceScreen();
|
||||||
Resources resources = getResources();
|
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
|
// Lock Clock Size
|
||||||
mClockFontSize = (CustomSeekBarPreference) findPreference(CLOCK_FONT_SIZE);
|
mClockFontSize = (CustomSeekBarPreference) findPreference(CLOCK_FONT_SIZE);
|
||||||
mClockFontSize.setValue(Settings.System.getInt(getContentResolver(),
|
mClockFontSize.setValue(Settings.System.getInt(getContentResolver(),
|
||||||
|
|||||||
Reference in New Issue
Block a user