diff --git a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp index 7c99fec..6d732b0 100644 --- a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp @@ -2,19 +2,19 @@ #include #include #include -#include +#include #include "jni.h" using android::sp; -using vendor::eureka::hardware::parts::V1_0::IBattery; +using vendor::eureka::hardware::parts::V1_0::IBatteryStats; using vendor::eureka::hardware::parts::V1_0::Number; using vendor::eureka::hardware::parts::V1_0::SysfsType; +static android::sp service = IBatteryStats::getService(); extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_setChargeSysfs(JNIEnv* env, __unused jclass obj, jint enable) { - android::sp service = IBattery::getService(); if (enable == 1) { service->setBatteryWritable(SysfsType::CHARGE, Number::ENABLE); } else { @@ -25,7 +25,6 @@ Java_com_eurekateam_samsungextras_interfaces_Battery_setChargeSysfs(JNIEnv* env, extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_getChargeSysfs(JNIEnv* env, __unused jclass obj) { - android::sp service = IBattery::getService(); int ret = service->getBatteryStats(SysfsType::CHARGE); return ret; } @@ -34,7 +33,6 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_setFastCharge(JNIEnv* env, __unused jobject obj, jint enable) { - android::sp service = IBattery::getService(); if (enable == 1) { service->setBatteryWritable(SysfsType::FASTCHARGE, Number::ENABLE); } else { @@ -44,7 +42,6 @@ Java_com_eurekateam_samsungextras_interfaces_Battery_setFastCharge(JNIEnv* env, extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_getFastChargeSysfs(JNIEnv* env, __unused jclass obj) { - android::sp service = IBattery::getService(); int ret = service->getBatteryStats(SysfsType::FASTCHARGE); return ret; } @@ -61,7 +58,7 @@ Java_com_eurekateam_samsungextras_interfaces_Battery_getGeneralBatteryStats(JNIE * 5 = BATTERY_TEMP * 6 = BATTERY_CURRENT */ - android::sp service = IBattery::getService(); + int ret; switch (id) { case 1: diff --git a/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp b/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp new file mode 100644 index 0000000..1a83260 --- /dev/null +++ b/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp @@ -0,0 +1,33 @@ +#include +#include +#include +#include +#include +#include "jni.h" + +using android::sp; +using vendor::eureka::hardware::parts::V1_0::Number; +using vendor::eureka::hardware::parts::V1_0::Display; +using vendor::eureka::hardware::parts::V1_0::IDisplayConfigs; + +static android::sp service = IDisplayConfigs::getService(); + +extern "C" JNIEXPORT void JNICALL +Java_com_eurekateam_samsungextras_interfaces_Display_setDT2W(JNIEnv* env, jclass clazz, jboolean enable) { + if (enable) { + service->writeDisplay(Number::ENABLE, + Display::DOUBLE_TAP); + } else { + service->writeDisplay(Number::DISABLE, + Display::DOUBLE_TAP); + } +} + +extern "C" JNIEXPORT void JNICALL +Java_com_eurekateam_samsungextras_interfaces_Display_setGloveMode(JNIEnv* env, jclass clazz, jboolean enable) { + if (enable) { + service->writeDisplay(Number::ENABLE, Display::GLOVE_MODE); + } else { + service->writeDisplay(Number::DISABLE, Display::GLOVE_MODE); + } +} diff --git a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp index 4319961..80aebbe 100644 --- a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp @@ -2,18 +2,19 @@ #include #include #include -#include +#include #include "jni.h" using android::sp; using vendor::eureka::hardware::parts::V1_0::Device; using vendor::eureka::hardware::parts::V1_0::Value; -using vendor::eureka::hardware::parts::V1_0::IFlashLight; +using vendor::eureka::hardware::parts::V1_0::IFlashBrightness; using vendor::eureka::hardware::parts::V1_0::Number; +static android::sp service = IFlashBrightness::getService(); + extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_setFlash( JNIEnv* env, __unused jobject obj, jint value) { - android::sp service = IFlashLight::getService(); service->setFlashlightEnable(Number::ENABLE); switch (value) { case 1: @@ -52,7 +53,6 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_F } extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash( JNIEnv* env, jobject clazz, jint isA10) { - android::sp service = IFlashLight::getService(); int ret; if (isA10 == 1) { ret = service->readFlashlightstats(Device::A10); diff --git a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp b/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp deleted file mode 100644 index 19ed3e2..0000000 --- a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include -#include -#include -#include -#include "jni.h" - -using android::sp; -using vendor::eureka::hardware::parts::V1_0::Number; -using vendor::eureka::hardware::parts::V1_0::IGpu; - -extern "C" JNIEXPORT void JNICALL -Java_com_eurekateam_samsungextras_interfaces_GPU_setGPU(JNIEnv* env, jclass clazz, jint enable) { - android::sp service = IGpu::getService(); - if (enable == 1) { - service->setGpuWritable(Number::ENABLE); - } else { - service->setGpuWritable(Number::DISABLE); - } -} -extern "C" JNIEXPORT jint JNICALL -Java_com_eurekateam_samsungextras_interfaces_GPU_getGPU(JNIEnv* env, jclass clazz) { - android::sp service = IGpu::getService(); - int ret = service->readGpustats(); - return ret; -} diff --git a/universal7885-common/apps/SamsungParts/jni/SELinuxBridge.cpp b/universal7885-common/apps/SamsungParts/jni/SELinuxBridge.cpp deleted file mode 100644 index b117f48..0000000 --- a/universal7885-common/apps/SamsungParts/jni/SELinuxBridge.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include -#include -#include -#include -#include "jni.h" - -using android::sp; -using vendor::eureka::hardware::parts::V1_0::Number; -using vendor::eureka::hardware::parts::V1_0::ISELinux; - -extern "C" JNIEXPORT jint JNICALL -Java_com_eurekateam_samsungextras_interfaces_SELinux_getSELinux(JNIEnv* env, jclass clazz) { - android::sp service = ISELinux::getService(); - int ret = service->readSELinuxstats(); - return ret; -} diff --git a/universal7885-common/apps/SamsungParts/res/values-de/strings.xml b/universal7885-common/apps/SamsungParts/res/values-de/strings.xml index 5cb2fc9..c5fab9b 100644 --- a/universal7885-common/apps/SamsungParts/res/values-de/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values-de/strings.xml @@ -60,21 +60,6 @@ Sonstiges - - Eingabegeräte Steuerung - Steuer Sensor Leistung. Kann benutzt werden um Batterie zu sparen. - Verwalte die Sensor Leistung hier. - wenn deine Batterie fast leer ist, kann dir diese Einstellung helfen. - - Exynos GPU (Mali) Throttling - Deaktiviere/Aktiviere GPU Throttling - - - SELinux Status - Klicke hier, um den SELinux Status anzuzeigen. - - Info - Batterie Schnellladen Einstellung diff --git a/universal7885-common/apps/SamsungParts/res/values-es/strings.xml b/universal7885-common/apps/SamsungParts/res/values-es/strings.xml index 5446bd9..b73ea77 100644 --- a/universal7885-common/apps/SamsungParts/res/values-es/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values-es/strings.xml @@ -57,22 +57,6 @@ Misc - - - Input Devices Control - Control sensor\'s power. Can be used to save battery. - Manage Sensor\'s Power here. - If you are really low on battery, perhaps this settings can help - - Exynos GPU (Mali) Throttling - Disable/Enable GPU Throttling - - - Estado del SELinux - Haga clic aquí para ver el estado actual de SELinux - - Info - Batería Configuración de Carga rápida diff --git a/universal7885-common/apps/SamsungParts/res/values-id/strings.xml b/universal7885-common/apps/SamsungParts/res/values-id/strings.xml deleted file mode 100644 index 28b8841..0000000 --- a/universal7885-common/apps/SamsungParts/res/values-id/strings.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - SamsungParts - Tweak Untuk Device - - - Bagian Display - - Info FPS - Menampilkan overlay Frame Per Detik - - - Bagian Audio - - - Pembersihan Speaker - Memainkan Audio 30 Detik Untuk Membersihkan Speaker - Gunakan fitur ini jika speakermu berdebuh atau kemasukan air, maksimalkan volume dan arahkan layar hp ke bawah, lalu tunggu 30 detik selama lagu dimainkan. - - - Dolby Atmos - Mengaktifkan Efek Dolby Atmos - Dolby Atmos adalah fitur untuk memperbesar volume yang kecil, seperti di oneui. Gunakan jika merasa speaker hp mu kurang besar. - Mode Yang Tersedia - Pilih salah satu - Profile Auto - Profile Movie - Profile Music - Profile Voice - Profile Gaming - Tidak Ada - Profile Game 1 - Profile Game 2 - Profile Spesial - - Fitur Eureka Kernel - - - Kecerahan Senter - Atur Kecerahan Sentermu - Jika merasa sentermu kurang terang maka gunakanlah fitur ini. Fitur ini dapat mempercerah atau menurunkan kecerahan pada sentermu. Sesuaikan Dengan Keinginan mu saja. - - - Misc - - - Kontrol Input - Kontrol Sensor bisa digunakan untuk menghemat baterai Android mu. - Atur sensor disini, jika baterai mu dalam keadaan sekarat. Fitur ini mungkin dapat membantumu. - - Exynos GPU (Mali) Throttling - Mengaktifkan/Menonaktifkan GPU Throttling - - - SELinux Status - Klik disini untuk melihat status SELinux mu. - - Informasi - - - Bagian Baterai - Pengaturan Pengecasan Cepat - Pengaturan Pengecasan - Mengaktifkan/Menonaktifkan Pengecasan Disini. - Informasi Baterai Dan Pengaturan - Mengaktifkan/Menonaktifkan Fitur Pengecasan Cepat, Seperti di oneui. - Atur Fitur Pengecasan Disini. - Baterai Misc Info - Bagian untuk Geeks - - Max Kapasitas Baterai (mAh) - Status Baterai - Baterai Diisi Hingga (%) - Baterai Diisi Hingga (mAh) - Suhu Baterai Saat Ini - Baterai Saat Ini (mA) - - - Aktifkan - - - Matikan - - - Value: %s - Default - Default value: %s\nLong press to set - Default value is set - - diff --git a/universal7885-common/apps/SamsungParts/res/values-pt-rBR/strings.xml b/universal7885-common/apps/SamsungParts/res/values-pt-rBR/strings.xml index 08a3d75..761b80c 100644 --- a/universal7885-common/apps/SamsungParts/res/values-pt-rBR/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values-pt-rBR/strings.xml @@ -60,21 +60,6 @@ Diversos - - Controle de sensores - Controlar a energia dos sensores. Pode ser utilizado para melhorar o consumo de energia. - Controle a energia dos sensores aqui. - Se você estiver realmente com pouca bateria, talvez essas configurações possam ajudar - - Exynos GPU (Mali) Throttling - Desativar/Ativar GPU Throttling - - - Status do SELinux - Clique aqui para ver o status atual do SELinux - - Informações - Bateria Configurações do Carregamento rápido diff --git a/universal7885-common/apps/SamsungParts/res/values-ro/strings.xml b/universal7885-common/apps/SamsungParts/res/values-ro/strings.xml index 51fb5d1..ebeb7bd 100644 --- a/universal7885-common/apps/SamsungParts/res/values-ro/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values-ro/strings.xml @@ -60,21 +60,6 @@ Misc - - Controlul dispozitivelor de intrare - Controleaza puterea senzorului.Poate fi folosita sa se salveze baterie. - Modifica puterea senzorului aici. - Daca ai baterie slaba, aceasta setare poate ajuta cat de cat. - - Exynos GPU (Mali) Throttling - Activeaza/Dezactiveaza GPU Throttling - - - SELinux Status - Apasa aici sa vezi statusul SELinux. - - Informatii - Baterie Setari FastCharge diff --git a/universal7885-common/apps/SamsungParts/res/values-ru/strings.xml b/universal7885-common/apps/SamsungParts/res/values-ru/strings.xml index 026d1d8..43343d5 100644 --- a/universal7885-common/apps/SamsungParts/res/values-ru/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values-ru/strings.xml @@ -57,21 +57,6 @@ Разное - - - Управление устройствами ввода - Управление питанием датчиков. Может использоваться для экономии заряда батареи. - Здесь происходит управление питанием датчиков. Если у Вас разряжен аккумулятор, возможно, эти настройки помогут. - - Регулирование графики Exynos (Mali) - Отключение/Включение регулирования - - - Статус SELinux - Нажмите сюда, чтобы увидеть текущий статус SELinux - - Информация - Батарея Экспресс зарядка diff --git a/universal7885-common/apps/SamsungParts/res/values/strings.xml b/universal7885-common/apps/SamsungParts/res/values/strings.xml index 78767e2..9a7105a 100644 --- a/universal7885-common/apps/SamsungParts/res/values/strings.xml +++ b/universal7885-common/apps/SamsungParts/res/values/strings.xml @@ -65,23 +65,11 @@ Flashlight Brightness. AOSP doesn\'t have this feature.\n\n Use this feature to adjust low or high flashlight brightness. Ranges from 0 to 10. - + Misc - - Input Devices Control - Control sensor\'s power. Can be used to save battery. - Manage Sensor\'s Power here. - If you are really low on battery, perhaps this settings can help - - Exynos GPU (Mali) Throttling - Disable/Enable GPU Throttling - - - SELinux Status - Click here to see current SELinux status - - Info + Toggle for double tap to wake + Toggle for glove mode Battery diff --git a/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml b/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml index 7e57b00..ebb51a5 100644 --- a/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml +++ b/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml @@ -48,16 +48,6 @@ android:targetPackage="com.eurekateam.samsungextras" /> - - - @@ -75,13 +65,15 @@ - + + + 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 f92faee..8b6644c 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt @@ -25,8 +25,8 @@ import androidx.preference.SwitchPreference 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.interfaces.Display.GloveMode +import com.eurekateam.samsungextras.interfaces.Display.DT2W import com.eurekateam.samsungextras.speaker.ClearSpeakerActivity class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { @@ -45,19 +45,10 @@ class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChange val mFpsInfo = findPreference(PREF_KEY_FPS_INFO)!! mFpsInfo.isChecked = prefs.getBoolean(PREF_KEY_FPS_INFO, false) mFpsInfo.onPreferenceChangeListener = this - val mGPUExynos = findPreference(PREF_GPUEXYNOS)!! - mGPUExynos.isChecked = GPU == 1 - mGPUExynos.onPreferenceChangeListener = this - val mSELinux = findPreference(PREF_SELINUX)!! - mSELinux.onPreferenceClickListener = - Preference.OnPreferenceClickListener { - Toast.makeText( - context, - if (SELinux == 1) "SELinux is in enforcing state." else "SELinux is in permissive state.", - Toast.LENGTH_SHORT - ).show() - true - } + val mDT2W = findPreference(PREF_DOUBLE_TAP)!! + mDT2W.onPreferenceChangeListener = this + val mGloveMode = findPreference(PREF_GLOVE_MODE)!! + mGloveMode.onPreferenceChangeListener = this val mFlashLight = findPreference(PREF_FLASHLIGHT)!! mFlashLight.onPreferenceClickListener = Preference.OnPreferenceClickListener { @@ -80,22 +71,18 @@ class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChange val fps_enabled = value as Boolean val fpsinfo = Intent(this.context, FPSInfoService::class.java) if (fps_enabled) { - this.requireContext().startService(fpsinfo) + requireContext().startService(fpsinfo) } else { - this.requireContext().stopService(fpsinfo) + requireContext().stopService(fpsinfo) } } - PREF_GPUEXYNOS -> { - val gpu_enabled = value as Boolean - GPU = if (gpu_enabled) 1 else 0 - Toast.makeText( - context, - if (gpu_enabled) "GPU Throttling is now enabled." else "GPU Throttling is now disabled.", - Toast.LENGTH_SHORT - ).show() - } - else -> { + PREF_DOUBLE_TAP -> { + DT2W = value as Boolean } + PREF_GLOVE_MODE -> { + GloveMode = value as Boolean + } + else -> {} } return true } @@ -104,8 +91,8 @@ class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChange const val PREF_KEY_FPS_INFO = "fps_info" private const val PREF_CLEAR_SPEAKER = "clear_speaker_settings" private const val PREF_FLASHLIGHT = "flashlight_settings" - const val PREF_GPUEXYNOS = "gpuexynos_settings" - private const val PREF_SELINUX = "selinux_settings" + const val PREF_DOUBLE_TAP = "dt2w_settings" + const val PREF_GLOVE_MODE = "glove_mode_settings" const val PREF_BATTERY = "battery_settings" } -} \ No newline at end of file +} diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Display.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Display.kt new file mode 100644 index 0000000..7007368 --- /dev/null +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Display.kt @@ -0,0 +1,9 @@ +package com.eurekateam.samsungextras.interfaces + +object Display { + var DT2W: Boolean = false + external set + + var GloveMode: Boolean = false + external set +} diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/GPU.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/GPU.kt deleted file mode 100644 index fcafaf7..0000000 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/GPU.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.eurekateam.samsungextras.interfaces - -object GPU { - var GPU: Int - external get - external set -} \ No newline at end of file diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/SELinux.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/SELinux.kt deleted file mode 100644 index 3a3602a..0000000 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/SELinux.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.eurekateam.samsungextras.interfaces - -object SELinux { - val SELinux: Int - external get -} \ No newline at end of file