diff options
3 files changed, 9 insertions, 8 deletions
diff --git a/configpanel/res/xml/button_panel.xml b/configpanel/res/xml/button_panel.xml index c0e77b4..a82f19e 100644 --- a/configpanel/res/xml/button_panel.xml +++ b/configpanel/res/xml/button_panel.xml @@ -22,12 +22,12 @@ android:key="fp_key" android:title="@string/fingerprint_title" > - <SwitchPreference + <SwitchPreferenceCompat android:key="fp_wakeup" android:title="@string/fingerprint_wakeup_title" android:summary="@string/fingerprint_wakeup_summary" /> - <SwitchPreference + <SwitchPreferenceCompat android:key="fp_pocketmode" android:title="@string/fingerprint_pocketmode_title" android:summary="@string/fingerprint_pocketmode_summary" diff --git a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java index 39057b3..4b25e1d 100644 --- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java +++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java @@ -27,7 +27,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; import org.lineageos.internal.util.FileUtils; import org.lineageos.internal.util.PackageManagerUtils; @@ -79,7 +79,7 @@ public class ButtonSettingsFragment extends PreferenceFragment super.addPreferencesFromResource(preferencesResId); // Initialize node preferences for (String pref : Constants.sBooleanNodePreferenceMap.keySet()) { - SwitchPreference b = (SwitchPreference) findPreference(pref); + SwitchPreferenceCompat b = (SwitchPreferenceCompat) findPreference(pref); if (b == null) continue; b.setOnPreferenceChangeListener(this); String node = Constants.sBooleanNodePreferenceMap.get(pref); @@ -106,7 +106,8 @@ public class ButtonSettingsFragment extends PreferenceFragment final PreferenceCategory fingerprintCategory = (PreferenceCategory) getPreferenceScreen().findPreference(Constants.CATEGORY_FP); - SwitchPreference b = (SwitchPreference) findPreference(Constants.FP_POCKETMODE_KEY); + SwitchPreferenceCompat b = + (SwitchPreferenceCompat) findPreference(Constants.FP_POCKETMODE_KEY); if (!PackageManagerUtils.isAppEnabled(getContext(), "org.lineageos.pocketmode")) { fingerprintCategory.removePreference(b); } else { @@ -116,7 +117,7 @@ public class ButtonSettingsFragment extends PreferenceFragment private void updatePreferencesBasedOnDependencies() { for (String pref : Constants.sNodeDependencyMap.keySet()) { - SwitchPreference b = (SwitchPreference) findPreference(pref); + SwitchPreferenceCompat b = (SwitchPreferenceCompat) findPreference(pref); if (b == null) continue; String dependencyNode = Constants.sNodeDependencyMap.get(pref)[0]; if (FileUtils.isFileReadable(dependencyNode)) { diff --git a/configpanel/src/org/lineageos/settings/device/Utils.java b/configpanel/src/org/lineageos/settings/device/Utils.java index 79eaea8..5a7d9d1 100644 --- a/configpanel/src/org/lineageos/settings/device/Utils.java +++ b/configpanel/src/org/lineageos/settings/device/Utils.java @@ -23,7 +23,7 @@ import android.content.SharedPreferences; import android.os.UserHandle; import androidx.preference.PreferenceManager; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; public class Utils { @@ -37,7 +37,7 @@ public class Utils { return preferences.getString(key, (String) Constants.sNodeDefaultMap.get(key)); } - public static void updateDependentPreference(Context context, SwitchPreference b, + public static void updateDependentPreference(Context context, SwitchPreferenceCompat b, String key, boolean shouldSetEnabled) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); boolean prefActualValue = preferences.getBoolean(key, false); |