From 95d062a8b1ab7a17bbf74199845e6d250f5d2a50 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Tue, 12 Apr 2022 20:20:08 +0900 Subject: [PATCH] universal7885: parts: Use contains() ro.product.device has e.g. derp_a20e --- .../src/com/eurekateam/samsungextras/DeviceSettings.kt | 4 ++-- .../eurekateam/samsungextras/flashlight/FlashLightFragment.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt index 16d1738..bc2657b 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt @@ -49,11 +49,11 @@ class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChange mFpsInfo.onPreferenceChangeListener = this val mDT2W = findPreference(PREF_DOUBLE_TAP)!! mDT2W.onPreferenceChangeListener = this - mDT2W.isEnabled = !(Build.PRODUCT == "a10" || Build.PRODUCT == "a20e") + mDT2W.isEnabled = !(Build.PRODUCT.contains("a10") || Build.PRODUCT.contains("a20e")) mDT2W.isChecked = mPrefs.getBoolean(PREF_DOUBLE_TAP, false) val mGloveMode = findPreference(PREF_GLOVE_MODE)!! mGloveMode.onPreferenceChangeListener = this - mGloveMode.isEnabled = !(Build.PRODUCT == "a10" || Build.PRODUCT == "a20e") + mGloveMode.isEnabled = !(Build.PRODUCT.contains("a10") || Build.PRODUCT.contains("a20e")) mGloveMode.isChecked = mPrefs.getBoolean(PREF_GLOVE_MODE, false) val mFlashLight = findPreference(PREF_FLASHLIGHT)!! mFlashLight.onPreferenceClickListener = diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt index ce8f355..c52f97f 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt @@ -36,7 +36,7 @@ class FlashLightFragment : PreferenceFragmentCompat(), Preference.OnPreferenceCh mFlashLightPref.onPreferenceChangeListener = this mFlashLightPref.setMax(10) mFlashLightPref.setMin(1) - mFlashLightPref.value = Flashlight.getFlash(if (Build.DEVICE == "a10") 1 else 0) + mFlashLightPref.value = Flashlight.getFlash(if (Build.DEVICE.contains("a10")) 1 else 0) } override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean { @@ -52,4 +52,4 @@ class FlashLightFragment : PreferenceFragmentCompat(), Preference.OnPreferenceCh companion object { const val PREF_FLASHLIGHT = "flashlight_pref" } -} \ No newline at end of file +}