Evolution-X-Devices/hardware_samsung-extra_interfaces
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: Update for QPR2

Browse Source 
app: Enable use_resource_processor for all sysui deps
This will make the build faster

Test: m checkbuild
Bug: 295208392
Signed-off-by: RisenID <risen@pixelexperience.org>
Change-Id: I0c1bd901429bbe3bf81c1530e156735f8637a96e

app: Migrate to CompoundButton.OnCheckedChangeListener
Switch and SwitchCompat are both CompoundButton.

Using CompoundButton in Java will helps migration in the future.

Bug: 306658427 | AOSP
Test: manual - check Settings pages
Test: m RunSettingsLibRoboTests
Signed-off-by: RisenID <risen@pixelexperience.org>
Change-Id: I85a70d4c504d8584030ea4a058f30d74206ab835

app: Migrate to SelectorWithWidgetPreference
Change-Id: Ie4aaa1fff836a407c1d8f5b919b7b0051748f5d3

Co-Authored-by: Peter Kalauskas <peskal@google.com>
Co-Authored-by: Chaohui Wang <chaohuiw@google.com>
Co-Authored-by: LuK1337 <priv.luk@gmail.com>
This commit is contained in:
roynatech2544
2024-03-29 20:20:18 +09:00
committed by Royna2544
parent 405b957149
commit 420366b66b
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/FlashControl/res/xml/flash_settings.xml
View File

@@ -21,23 +21,23 @@
<PreferenceCategory
android:title="@string/flash_intesities_category">
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="flash_intesity_1"
android:title="@string/flash_intesity_1" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="flash_intesity_2"
android:title="@string/flash_intesity_2" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="flash_intesity_3"
android:title="@string/flash_intesity_3" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="flash_intesity_4"
android:title="@string/flash_intesity_4" />
<com.android.settingslib.widget.RadioButtonPreference
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="flash_intesity_5"
android:title="@string/flash_intesity_5" />

3
app/FlashControl/src/com/royna/flashcontrol/FlashActivity.kt
View File

@@ -19,7 +19,6 @@ package com.royna.flashcontrol
import android.os.Bundle
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
import com.android.settingslib.widget.R
class FlashActivity : CollapsingToolbarBaseActivity() {
private var mInstance : FlashFragment? = null
@@ -27,7 +26,7 @@ class FlashActivity : CollapsingToolbarBaseActivity() {
super.onCreate(savedInstanceState)
if (mInstance == null) mInstance = FlashFragment()
supportFragmentManager.beginTransaction().replace(
R.id.content_frame,
com.android.settingslib.collapsingtoolbar.R.id.content_frame,
mInstance!!
).commit()
}

20
app/FlashControl/src/com/royna/flashcontrol/FlashFragment.kt
View File

@@ -27,15 +27,15 @@ import android.os.ServiceManager
import android.provider.Settings
import android.util.Log
import android.widget.Toast
import android.widget.Switch
import android.widget.CompoundButton
import android.widget.CompoundButton.OnCheckedChangeListener
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import com.android.settingslib.widget.MainSwitchPreference
import com.android.settingslib.widget.OnMainSwitchChangeListener
import com.android.settingslib.widget.RadioButtonPreference
import com.android.settingslib.widget.SelectorWithWidgetPreference
import java.lang.IllegalStateException
@@ -43,7 +43,7 @@ import com.royna.flashcontrol.R
import vendor.samsung_ext.hardware.camera.flashlight.IFlashlight
class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
class FlashFragment : PreferenceFragmentCompat(), OnCheckedChangeListener {
private lateinit var switchBar: MainSwitchPreference
private val mService : IFlashlight? = IFlashlight.Stub.asInterface(ServiceManager.waitForDeclaredService("vendor.samsung_ext.hardware.camera.flashlight.IFlashlight/default"))
@@ -77,7 +77,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
val mSavedIntesity = mSharedPreferences.getInt(PREF_FLASH_INTESITY, 1)
for ((key, value) in PREF_FLASH_MODES) {
val preference = findPreference<RadioButtonPreference>(key)!!
val preference = findPreference<SelectorWithWidgetPreference>(key)!!
preference.isChecked = value == mSavedIntesity
preference.isEnabled = switchBar.isChecked
preference.setOnPreferenceClickListener {
@@ -136,17 +136,17 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
}
}
override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
if (mService == null) {
Log.e(TAG, "mService is null...")
switchView.setChecked(false)
buttonView.setChecked(false)
return
}
try {
mService.enableFlash(isChecked)
} catch (e : IllegalStateException) {
Log.w(TAG, "enableFlash() failed")
switchView.setChecked(false)
buttonView.setChecked(false)
return
}
val kBright = mService.getCurrentBrightness()
@@ -158,7 +158,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
private fun changeRadioButtons(enable: Boolean) {
for ((key, _) in PREF_FLASH_MODES) {
val mPreference = findPreference<RadioButtonPreference>(key)!!
val mPreference = findPreference<SelectorWithWidgetPreference>(key)!!
mPreference.isEnabled = enable
}
}
@@ -174,7 +174,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
}
mService.setBrightness(intesity)
for ((key, value) in PREF_FLASH_MODES) {
val preference = findPreference<RadioButtonPreference>(key)!!
val preference = findPreference<SelectorWithWidgetPreference>(key)!!
preference.isChecked = value == intesity
}
mSharedPreferences.edit().putInt(PREF_FLASH_INTESITY, intesity).apply()

5
app/SmartCharge/src/com/royna/smartcharge/SmartChargeActivity.kt
View File

@@ -19,7 +19,6 @@ package com.royna.smartcharge
import android.os.Bundle
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
import com.android.settingslib.widget.R
class SmartChargeActivity : CollapsingToolbarBaseActivity() {
private var mInstance : SmartChargeFragment? = null
@@ -27,8 +26,8 @@ class SmartChargeActivity : CollapsingToolbarBaseActivity() {
super.onCreate(savedInstanceState)
if (mInstance == null) mInstance = SmartChargeFragment()
supportFragmentManager.beginTransaction().replace(
R.id.content_frame,
com.android.settingslib.collapsingtoolbar.R.id.content_frame,
mInstance!!
).commit()
}
}
}

10
app/SmartCharge/src/com/royna/smartcharge/SmartChargeFragment.kt
View File

@@ -23,7 +23,8 @@ import android.os.Handler
import android.os.Looper
import android.os.ServiceManager
import android.util.Log
import android.widget.Switch
import android.widget.CompoundButton
import android.widget.CompoundButton.OnCheckedChangeListener
import android.widget.Toast
import androidx.preference.Preference
@@ -33,7 +34,6 @@ import androidx.preference.SeekBarPreference
import androidx.preference.SwitchPreference
import com.android.settingslib.widget.MainSwitchPreference
import com.android.settingslib.widget.OnMainSwitchChangeListener
import com.royna.smartcharge.R
@@ -42,7 +42,7 @@ import vendor.samsung_ext.framework.battery.ISmartCharge
import java.lang.IllegalArgumentException
import java.lang.IllegalStateException
class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
class SmartChargeFragment : PreferenceFragmentCompat(), OnCheckedChangeListener {
private lateinit var mMainSwitch : MainSwitchPreference
private lateinit var mStopBar : SeekBarPreference
private lateinit var mRestartBar : SeekBarPreference
@@ -138,7 +138,7 @@ class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListen
}
}
override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
runCatching {
if (isChecked) { when (mConfig) {
Config.STOP_RESTART -> {
@@ -162,7 +162,7 @@ class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListen
is IllegalStateException -> {
// Config error...
mMainHandler.post {
switchView.isChecked = false
mMainSwitch.isChecked = false
Toast.makeText(requireContext(),
R.string.smart_charge_invalid_config, Toast.LENGTH_SHORT).show()
}