diff options
Diffstat (limited to 'configpanel')
| -rw-r--r-- | configpanel/Android.bp | 22 | ||||
| -rw-r--r-- | configpanel/Android.mk | 29 | ||||
| -rw-r--r-- | configpanel/res/xml/button_panel.xml | 4 | ||||
| -rw-r--r-- | configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java | 9 | ||||
| -rw-r--r-- | configpanel/src/org/lineageos/settings/device/Utils.java | 4 |
5 files changed, 30 insertions, 38 deletions
diff --git a/configpanel/Android.bp b/configpanel/Android.bp new file mode 100644 index 0000000..a6bf220 --- /dev/null +++ b/configpanel/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2017-2023 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// +android_app { + name: "ConfigPanel", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + certificate: "platform", + platform_apis: true, + privileged: true, + required: ["ZukPocketMode"], + system_ext_specific: true, + static_libs: [ + "org.lineageos.platform.internal", + "org.lineageos.settings.resources", + ], + optimize: { + proguard_flags_files: ["proguard.flags"], + }, +} diff --git a/configpanel/Android.mk b/configpanel/Android.mk deleted file mode 100644 index c44d4ca..0000000 --- a/configpanel/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_CERTIFICATE := platform -LOCAL_PRIVILEGED_MODULE := true -LOCAL_PACKAGE_NAME := ConfigPanel -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_REQUIRED_MODULES := ZukPocketMode -LOCAL_PRODUCT_MODULE := true - -LOCAL_USE_AAPT2 := true - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.core_core \ - org.lineageos.settings.resources - -LOCAL_STATIC_JAVA_LIBRARIES := \ - org.lineageos.platform.internal - -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - $(TOP)/packages/resources/devicesettings/res - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_PACKAGE) 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 9605bdf..4ca8114 100644 --- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java +++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java @@ -21,14 +21,13 @@ import android.app.ActionBar; import android.content.SharedPreferences; import android.os.Bundle; import android.text.TextUtils; -import android.view.MenuItem; import androidx.preference.ListPreference; 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; @@ -80,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); @@ -107,7 +106,7 @@ 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 { @@ -117,7 +116,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); |