From 1d39eb76e82f9de4d9d91884542ed8753d4aa63a Mon Sep 17 00:00:00 2001
From: Soo-Hwan Na <69458352+roynatech2544@users.noreply.github.com>
Date: Fri, 19 Nov 2021 20:00:15 +0900
Subject: [PATCH] universal7885: SamsungParts: Match latest source changes

---
 .../apps/SamsungParts/AndroidManifest.xml     | 34 ++-------------
 .../apps/SamsungParts/jni/GPUBridge.cpp       |  2 +-
 .../SamsungParts/res/drawable/ic_reset.xml    | 11 +++++
 .../apps/SamsungParts/res/values/colors.xml   |  4 +-
 .../apps/SamsungParts/res/values/strings.xml  | 11 ++---
 .../res/xml/preferences_samsung_parts.xml     |  6 +--
 .../eurekateam/samsungextras/BootReceiver.kt  | 42 -------------------
 .../{main => }/DeviceSettings.kt              |  3 +-
 .../{main => }/DeviceSettingsActivity.kt      |  2 +-
 .../com/eurekateam/samsungextras/Startup.kt   | 36 ----------------
 10 files changed, 29 insertions(+), 122 deletions(-)
 create mode 100644 universal7885-common/apps/SamsungParts/res/drawable/ic_reset.xml
 delete mode 100644 universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt
 rename universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/{main => }/DeviceSettings.kt (98%)
 rename universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/{main => }/DeviceSettingsActivity.kt (97%)
 delete mode 100644 universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/Startup.kt

diff --git a/universal7885-common/apps/SamsungParts/AndroidManifest.xml b/universal7885-common/apps/SamsungParts/AndroidManifest.xml
index 391cc18..7ce8686 100644
--- a/universal7885-common/apps/SamsungParts/AndroidManifest.xml
+++ b/universal7885-common/apps/SamsungParts/AndroidManifest.xml
@@ -17,21 +17,6 @@
         android:theme="@style/CustomOptionsTheme"
         android:fullBackupOnly="true"
         android:allowBackup="true">
-
-        <receiver
-            android:name=".BootReceiver"
-            android:defaultToDeviceProtectedStorage="true"
-            android:directBootAware="true"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter android:priority="1000">
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
-            </intent-filter>
-        </receiver>
-
         <activity
             android:name=".DeviceSettingsActivity"
             android:exported="true"
@@ -64,7 +49,6 @@
             android:name="com.eurekateam.samsungextras.speaker.ClearSpeakerActivity" 
             android:exported="true"
             android:label="@string/clear_speaker_title">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -74,7 +58,6 @@
             android:name="com.eurekateam.samsungextras.flashlight.FlashLightActivity"
             android:exported="true"
             android:label="@string/flashlight_title">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -100,18 +83,7 @@
             </intent-filter>
         </activity>
         <service
-            android:name=".SamsungPartsTile"
-            android:enabled="true"
-            android:icon="@drawable/ic_device"
-            android:label="@string/advanced_settings"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
-            </intent-filter>
-        </service>
-        <service
-            android:name=".DolbyTile"
+            android:name=".dolby.DolbyTile"
             android:enabled="true"
             android:icon="@drawable/ic_speaker_cleaner_icon"
             android:label="@string/dolby_title"
@@ -122,11 +94,11 @@
             </intent-filter>
         </service>
         <service
-            android:name=".FPSInfoService"
+            android:name=".fps.FPSInfoService"
             android:exported="false">
         </service>
         <service
-            android:name=".FPSTileService"
+            android:name=".fps.FPSTileService"
             android:icon="@drawable/ic_fps_info"
             android:label="@string/fps_info_title"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
diff --git a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp b/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
index e07a777..326bfdd 100644
--- a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
+++ b/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
@@ -13,7 +13,7 @@ extern "C"
 JNIEXPORT void JNICALL
 Java_com_eurekateam_samsungextras_interfaces_GPU_setGPU(JNIEnv *env, jclass clazz, jint enable) {
       android::sp<IGpu> service = IGpu::getService();
-      if (enable == 1){
+       if (enable == 1){
             service->setGpuWritable(Enable::ENABLE);
       }else{
             service->setGpuWritable(Enable::DISABLE);
diff --git a/universal7885-common/apps/SamsungParts/res/drawable/ic_reset.xml b/universal7885-common/apps/SamsungParts/res/drawable/ic_reset.xml
new file mode 100644
index 0000000..f37ece8
--- /dev/null
+++ b/universal7885-common/apps/SamsungParts/res/drawable/ic_reset.xml
@@ -0,0 +1,11 @@
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,3A9,9 0 0,0 3,12H0L4,16L8,12H5A7,7 0 0,1 12,5A7,7 0 0,1 19,12A7,7 0 0,1 12,19C10.5,19 9.09,18.5 7.94,17.7L6.5,19.14C8.04,20.3 9.94,21 12,21A9,9 0 0,0 21,12A9,9 0 0,0 12,3M14,12A2,2 0 0,0 12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12Z" />
+</vector>
\ No newline at end of file
diff --git a/universal7885-common/apps/SamsungParts/res/values/colors.xml b/universal7885-common/apps/SamsungParts/res/values/colors.xml
index fcdd84d..1f8aec7 100644
--- a/universal7885-common/apps/SamsungParts/res/values/colors.xml
+++ b/universal7885-common/apps/SamsungParts/res/values/colors.xml
@@ -15,5 +15,7 @@
 
     <color name="disabled_text_color">#66000000</color>
     <color name="homepage_parts_background">#FFFF6700</color>
-
+    <color name="red">#FF0000</color>
+    <color name="green">#00FF00</color>
+    <color name="blue">#0000FF</color>
 </resources>
diff --git a/universal7885-common/apps/SamsungParts/res/values/strings.xml b/universal7885-common/apps/SamsungParts/res/values/strings.xml
index fc9ec67..2eabf24 100644
--- a/universal7885-common/apps/SamsungParts/res/values/strings.xml
+++ b/universal7885-common/apps/SamsungParts/res/values/strings.xml
@@ -20,7 +20,6 @@
 
     <!-- Display category -->
     <string name="display_category">Display</string>
-
     <!-- FPS Info -->
     <string name="fps_info_title">FPS info overlay</string>
     <string name="fps_info_summary">Show overlay with current frames per second</string>
@@ -48,9 +47,6 @@
     <string name="dolby_profile_game_1">Game 1 Profile</string>
     <string name="dolby_profile_game_2">Game 2 Profile</string>
     <string name="dolby_profile_special_audio">Special Audio Profile</string>
-
-
-
     <!-- Eureka Kernel features category -->
     <string name="eureka_kernel_features">Eureka Kernel Features</string>
 
@@ -62,8 +58,13 @@
         Use this feature to adjust low or high flashlight brightness. Ranges from 0 to 10.</string>
 
     <!-- GPU Category -->
-    <string name="gpu_category">GPU</string>
+    <string name="misc_category">Misc</string>
 
+    <!-- Inout Devices Settings -->
+    <string name="input_ctrl_title">Input Devices Control</string>
+    <string name="input_ctrl_summary">Control sensor\'s power. Can be used to save battery.</string>
+    <string name="input_ctrl_description">Manage Sensor\'s Power here.
+        If you are really low on battery, perhaps this settings can help</string>
     <!-- GPU TMU -->
     <string name="gpuexynos_title">Exynos GPU (Mali) Throttling</string>
     <string name="gpuexynos_summary">Disable/Enable GPU Throttling</string>
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 b93e952..7e57b00 100644
--- a/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml
+++ b/universal7885-common/apps/SamsungParts/res/xml/preferences_samsung_parts.xml
@@ -49,8 +49,8 @@
         </Preference>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="gpu"
-        android:title="@string/gpu_category">
+        android:key="misc"
+        android:title="@string/misc_category">
         <SwitchPreference
             android:key="gpuexynos_settings"
             android:title="@string/gpuexynos_title"
@@ -69,7 +69,7 @@
             android:persistent="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetClass="com.eurekateam.samsungextras.fastcharge.FastChargeActivity"
+            android:targetClass="com.eurekateam.samsungextras.battery.BatteryActivity"
             android:targetPackage="com.eurekateam.samsungextras" />
         </Preference>
 
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt
deleted file mode 100644
index e0fe655..0000000
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2020 The Xiaomi-SM6250 Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.eurekateam.samsungextras
-
-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) {
-        if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED, ignoreCase = true)) {
-            val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
-            val fpsenabled = sharedPrefs.getBoolean(DeviceSettings.PREF_KEY_FPS_INFO, false)
-            if (fpsenabled) {
-                context.startService(Intent(context, FPSInfoService::class.java))
-            }
-            val gpuenabled = sharedPrefs.getBoolean(DeviceSettings.PREF_GPUEXYNOS, true)
-            if (gpuenabled) {
-                GPU.GPU = 1
-            }else{
-                GPU.GPU = 0
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettings.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt
similarity index 98%
rename from universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettings.kt
rename to universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt
index ad3192b..f92faee 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettings.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.eurekateam.samsungextras.main
+package com.eurekateam.samsungextras
 
 import android.content.Intent
 import android.os.Bundle
@@ -22,7 +22,6 @@ import androidx.preference.Preference
 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
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettingsActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt
similarity index 97%
rename from universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettingsActivity.kt
rename to universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt
index 582ab8c..3302af4 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/main/DeviceSettingsActivity.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettingsActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.eurekateam.samsungextras.main
+package com.eurekateam.samsungextras
 
 import android.os.Bundle
 import android.view.MenuItem
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/Startup.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/Startup.kt
deleted file mode 100644
index 2453d32..0000000
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/Startup.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2013 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.eurekateam.samsungextras
-
-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) {
-        val enabled: Boolean
-        val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
-        enabled = sharedPrefs.getBoolean(DeviceSettings.PREF_KEY_FPS_INFO, false)
-        if (enabled) {
-            context.startService(Intent(context, FPSInfoService::class.java))
-        }
-    }
-}
\ No newline at end of file