bunnypad/android_device_samsung_a20
Watch
1
0
Fork
You've already forked android_device_samsung_a20
 0
mirror of https://github.com/chararomandroid/android_device_samsung_a20 synced 2026-08-21 11:55:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

universal7885: SamsungParts: Address deprecation

Browse source 
* Of android.preference. Need to use Jetpack support lib

Change-Id: I21bbd31c766179fe51fec4b812a6daa1e223a664
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
This commit is contained in:
roynatech2544 2021-11-19 11:59:18 +09:00
commit dac87c4a19
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
18 changed files with 51 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt
View file

@ -19,7 +19,9 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import androidx.preference.PreferenceManager
import com.eurekateam.samsungextras.fps.FPSInfoService
import com.eurekateam.samsungextras.interfaces.GPU
import com.eurekateam.samsungextras.main.DeviceSettings
class BootReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {

19
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/SamsungPartsTile.kt
View file

@ -1,19 +0,0 @@
package com.eurekateam.samsungextras
import android.content.ActivityNotFoundException
import android.content.Intent
import android.service.quicksettings.TileService
class SamsungPartsTile : TileService() {
override fun onClick() {
try {
val intent = Intent(this, DeviceSettingsActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
startActivityAndCollapse(intent)
} catch (ignored: ActivityNotFoundException) {
// At this point, the app is most likely hidden and set to only open from Settings
val intent = Intent(this, DeviceSettings::class.java)
startActivityAndCollapse(intent)
}
}
}

2
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/Startup.kt
View file

@ -21,6 +21,8 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import androidx.preference.PreferenceManager
import com.eurekateam.samsungextras.fps.FPSInfoService
import com.eurekateam.samsungextras.main.DeviceSettings
class Startup : BroadcastReceiver() {
override fun onReceive(context: Context, bootintent: Intent) {

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryActivity.kt
View file

@ -25,11 +25,11 @@ class BatteryActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
actionBar.setDisplayHomeAsUpEnabled(true)
val fragment = fragmentManager.findFragmentById(content)
val fragment = this.supportFragmentManager.findFragmentById(content)
val batteryFragment: BatteryFragment
if (fragment == null) {
batteryFragment = BatteryFragment()
fragmentManager.beginTransaction()
this.supportFragmentManager.beginTransaction()
.add(content, batteryFragment)
.commit()
}

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt
View file

@ -19,12 +19,12 @@ import android.os.Bundle
import android.widget.Toast
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragment
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import com.eurekateam.samsungextras.R
import com.eurekateam.samsungextras.interfaces.Battery
class BatteryFragment : PreferenceFragment(), Preference.OnPreferenceChangeListener {
class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private var mFastChargePref: SwitchPreference? = null
private var mChargePref: SwitchPreference? = null
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt
View file

@ -25,11 +25,11 @@ class DolbyActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
actionBar.setDisplayHomeAsUpEnabled(true)
val fragment = fragmentManager.findFragmentById(content)
val fragment = this.supportFragmentManager.findFragmentById(content)
val dolbyFragment: DolbyFragment
if (fragment == null) {
dolbyFragment = DolbyFragment()
fragmentManager.beginTransaction()
this.supportFragmentManager.beginTransaction()
.add(content, dolbyFragment)
.commit()
}

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt
View file

@ -18,11 +18,11 @@ package com.eurekateam.samsungextras.dolby
import android.os.Bundle
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragment
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import com.eurekateam.samsungextras.R
class DolbyFragment : PreferenceFragment(), Preference.OnPreferenceChangeListener {
class DolbyFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private var DolbyModesPreference: ListPreference? = null
private var DolbyEnablePreference: SwitchPreference? = null
private var dolbyCore = DolbyCore()

3
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DolbyTile.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyTile.kt
View file

@ -1,8 +1,7 @@
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.dolby
import android.service.quicksettings.Tile
import android.service.quicksettings.TileService
import com.eurekateam.samsungextras.dolby.DolbyCore
class DolbyTile : TileService() {
private var isRunning = false

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightActivity.kt
View file

@ -25,11 +25,11 @@ class FlashLightActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
actionBar.setDisplayHomeAsUpEnabled(true)
val fragment = fragmentManager.findFragmentById(content)
val fragment = this.supportFragmentManager.findFragmentById(content)
val flashLightFragment: FlashLightFragment
if (fragment == null) {
flashLightFragment = FlashLightFragment()
fragmentManager.beginTransaction()
this.supportFragmentManager.beginTransaction()
.add(content, flashLightFragment)
.commit()
}

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt
View file

@ -17,7 +17,7 @@ package com.eurekateam.samsungextras.flashlight
import android.os.Bundle
import androidx.preference.Preference
import androidx.preference.PreferenceFragment
import androidx.preference.PreferenceFragmentCompat
import com.eurekateam.samsungextras.GlobalConstants
import com.eurekateam.samsungextras.R
import com.eurekateam.samsungextras.interfaces.Flashlight
@ -25,7 +25,7 @@ import com.eurekateam.samsungextras.preferences.CustomSeekBarPreference
import com.eurekateam.samsungextras.utils.SystemProperties
import java.io.File
class FlashLightFragment : PreferenceFragment(), Preference.OnPreferenceChangeListener {
class FlashLightFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private var mFlashLightPref: CustomSeekBarPreference? = null
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.flashlight_settings)

9
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/FPSInfoService.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSInfoService.kt
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.fps
import android.app.Service
import android.content.BroadcastReceiver
@ -28,6 +28,7 @@ import android.util.Log
import android.view.Gravity
import android.view.View
import android.view.WindowManager
import com.eurekateam.samsungextras.utils.SurfaceFlingerFPS
import kotlin.math.roundToInt
open class FPSInfoService : Service() {
@ -36,6 +37,7 @@ open class FPSInfoService : Service() {
private val TAG = "FPSInfoService"
private var fPSInfoString: String? = null
private var mDreamManager: IDreamManager? = null
private var mRunning : Boolean = false
private inner class FPSView(c: Context) : View(c) {
private val mOnlinePaint: Paint?
@ -217,6 +219,7 @@ open class FPSInfoService : Service() {
private fun startThread() {
Log.d(TAG, "started CurFPSThread")
mRunning = true
mCurFPSThread = CurFPSThread(mView!!.handler)
surfaceFlingerFPS!!.start()
mCurFPSThread?.start()
@ -233,9 +236,13 @@ open class FPSInfoService : Service() {
e.printStackTrace()
}
}
mRunning = false
mCurFPSThread = null
}
fun getRunning() : Boolean{
return mRunning
}
companion object {
private var surfaceFlingerFPS: SurfaceFlingerFPS? = null
}

13
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/FPSTileService.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSTileService.kt
View file

@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.fps
import android.app.ActivityManager
import android.content.Intent
import android.service.quicksettings.Tile
import android.service.quicksettings.TileService
@ -25,14 +24,8 @@ class FPSTileService : TileService() {
private var isShowing = false
override fun onStartListening() {
super.onStartListening()
val manager = getSystemService(ACTIVITY_SERVICE) as ActivityManager
for (service in manager.getRunningServices(Int.MAX_VALUE)) {
if (FPSInfoService::class.java.name ==
service.service.className
) {
isShowing = true
}
}
val fpsInfoService = FPSInfoService()
isShowing = fpsInfoService.getRunning()
updateTile()
}

18
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettings.kt
View file

@ -13,22 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.main
import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.preference.Preference
import androidx.preference.PreferenceFragment
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import androidx.preference.SwitchPreference
import com.eurekateam.samsungextras.R
import com.eurekateam.samsungextras.battery.BatteryActivity
import com.eurekateam.samsungextras.flashlight.FlashLightActivity
import com.eurekateam.samsungextras.fps.FPSInfoService
import com.eurekateam.samsungextras.interfaces.GPU.GPU
import com.eurekateam.samsungextras.interfaces.SELinux.SELinux
import com.eurekateam.samsungextras.speaker.ClearSpeakerActivity
class DeviceSettings : PreferenceFragment(), Preference.OnPreferenceChangeListener {
class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
System.loadLibrary("samsungparts_jni")
setPreferencesFromResource(R.xml.preferences_samsung_parts, rootKey)
@ -37,7 +39,7 @@ class DeviceSettings : PreferenceFragment(), Preference.OnPreferenceChangeListen
val mClearSpeakerPref = findPreference<Preference>(PREF_CLEAR_SPEAKER)!!
mClearSpeakerPref.onPreferenceClickListener =
Preference.OnPreferenceClickListener {
val intent = Intent(activity.applicationContext, ClearSpeakerActivity::class.java)
val intent = Intent(requireActivity().applicationContext, ClearSpeakerActivity::class.java)
startActivity(intent)
true
}
@ -60,14 +62,14 @@ class DeviceSettings : PreferenceFragment(), Preference.OnPreferenceChangeListen
val mFlashLight = findPreference<Preference>(PREF_FLASHLIGHT)!!
mFlashLight.onPreferenceClickListener =
Preference.OnPreferenceClickListener {
val intent = Intent(activity.applicationContext, FlashLightActivity::class.java)
val intent = Intent(requireActivity().applicationContext, FlashLightActivity::class.java)
startActivity(intent)
true
}
val mFastCharge = findPreference<Preference>(PREF_BATTERY)!!
mFastCharge.onPreferenceClickListener =
Preference.OnPreferenceClickListener {
val intent = Intent(activity.applicationContext, BatteryActivity::class.java)
val intent = Intent(requireActivity().applicationContext, BatteryActivity::class.java)
startActivity(intent)
true
}
@ -79,9 +81,9 @@ class DeviceSettings : PreferenceFragment(), Preference.OnPreferenceChangeListen
val fps_enabled = value as Boolean
val fpsinfo = Intent(this.context, FPSInfoService::class.java)
if (fps_enabled) {
this.context.startService(fpsinfo)
this.requireContext().startService(fpsinfo)
} else {
this.context.stopService(fpsinfo)
this.requireContext().stopService(fpsinfo)
}
}
PREF_GPUEXYNOS -> {

10
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettingsActivity.kt
View file

@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.main
import android.app.Activity
import android.os.Bundle
import android.view.MenuItem
import androidx.fragment.app.FragmentActivity
import com.android.internal.R.id.content
import com.android.internal.R.id.home
class DeviceSettingsActivity : Activity() {
class DeviceSettingsActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
actionBar.setDisplayHomeAsUpEnabled(true)
val fragment = fragmentManager.findFragmentById(content)
val fragment = this.supportFragmentManager.findFragmentById(content)
val mDeviceSettingsFragment: DeviceSettings
if (fragment == null) {
mDeviceSettingsFragment = DeviceSettings()
fragmentManager.beginTransaction()
this.supportFragmentManager.beginTransaction()
.add(content, mDeviceSettingsFragment)
.commit()
}

4
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerActivity.kt
View file

@ -25,11 +25,11 @@ class ClearSpeakerActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
actionBar.setDisplayHomeAsUpEnabled(true)
val fragment = fragmentManager.findFragmentById(content)
val fragment = this.supportFragmentManager.findFragmentById(content)
val clearSpeakerFragment: ClearSpeakerFragment
if (fragment == null) {
clearSpeakerFragment = ClearSpeakerFragment()
fragmentManager.beginTransaction()
this.supportFragmentManager.beginTransaction()
.add(content, clearSpeakerFragment)
.commit()
}

8
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/speaker/ClearSpeakerFragment.kt
View file

@ -23,12 +23,12 @@ import android.os.Handler
import android.os.Looper
import android.util.Log
import androidx.preference.Preference
import androidx.preference.PreferenceFragment
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import com.eurekateam.samsungextras.R
import java.io.IOException
class ClearSpeakerFragment : PreferenceFragment(), Preference.OnPreferenceChangeListener {
class ClearSpeakerFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private var mAudioManager: AudioManager? = null
private var mHandler: Handler? = null
private var mMediaPlayer: MediaPlayer? = null
@ -38,7 +38,7 @@ class ClearSpeakerFragment : PreferenceFragment(), Preference.OnPreferenceChange
mClearSpeakerPref = findPreference(PREF_CLEAR_SPEAKER)
mClearSpeakerPref!!.onPreferenceChangeListener = this
mHandler = Handler(Looper.getMainLooper())
mAudioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
mAudioManager = requireContext().getSystemService(Context.AUDIO_SERVICE) as AudioManager
}
override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
@ -67,7 +67,7 @@ class ClearSpeakerFragment : PreferenceFragment(), Preference.OnPreferenceChange
private fun startPlaying(): Boolean {
mAudioManager!!.setParameters("status_earpiece_clean=on")
mMediaPlayer = MediaPlayer()
activity.volumeControlStream = AudioManager.STREAM_MUSIC
requireActivity().volumeControlStream = AudioManager.STREAM_MUSIC
mMediaPlayer!!.setAudioStreamType(AudioManager.STREAM_MUSIC)
mMediaPlayer!!.isLooping = true
try {

2
universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/SurfaceFlingerFPS.kt → universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/utils/SurfaceFlingerFPS.kt
View file

@ -1,4 +1,4 @@
package com.eurekateam.samsungextras
package com.eurekateam.samsungextras.utils
import android.os.Parcel
import android.os.ServiceManager

2
universal7885-common/universal7885-common.mk
View file

@ -124,7 +124,7 @@ PRODUCT_PACKAGES += \
# Light
PRODUCT_PACKAGES += \
android.hardware.light@2.0-service.samsung
android.hardware.light@2.0-service.eureka
# Media
PRODUCT_COPY_FILES += \