Merge branch 'ReChronoRain:main' into main

ReChronoRain · Jul 3, 2024 · 414150f · 414150f
2 parents db18a2b + a0cad73
commit 414150f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkT.java b/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkT.java
@@ -146,7 +146,7 @@ public void handleLoadPackage() {
         if (isPad()) {
             initHook(IgnoreStylusKeyGesture.INSTANCE, mPrefsMap.getBoolean("mipad_input_ingore_gesture"));
             initHook(NoMagicPointer.INSTANCE, mPrefsMap.getBoolean("mipad_input_close_magic"));
-            initHook(RemoveStylusBluetoothRestriction.INSTANCE, mPrefsMap.getBoolean("mipad_input_disable_bluetooth"));
+            initHook(RemoveStylusBluetoothRestriction.INSTANCE, mPrefsMap.getBoolean("mipad_input_disable_bluetooth_new"));
             initHook(RestoreEsc.INSTANCE, mPrefsMap.getBoolean("mipad_input_restore_esc"));
             initHook(SetGestureNeedFingerNum.INSTANCE, mPrefsMap.getBoolean("mipad_input_need_finger_num"));
         }

diff --git a/app/src/main/res/xml/various_mipad.xml b/app/src/main/res/xml/various_mipad.xml
@@ -15,12 +15,6 @@
             android:key="prefs_key_mipad_input_restore_esc"
             android:defaultValue="false" />
 
-        <SwitchPreference
-            android:title="@string/various_mipad_input_disable_bluetooth_title"
-            android:summary="@string/various_mipad_input_disable_bluetooth_desc"
-            android:key="prefs_key_mipad_input_disable_bluetooth"
-            android:defaultValue="true" />
-
         <SwitchPreference
             android:title="@string/various_mipad_input_ingore_gesture_title"
             android:summary="@string/various_mipad_input_ingore_gesture_desc"
@@ -33,11 +27,18 @@
             android:key="prefs_key_mipad_input_need_finger_num"
             android:defaultValue="false" />
 
+        <SwitchPreference
+            android:title="@string/various_mipad_input_disable_bluetooth_title"
+            android:summary="@string/various_mipad_input_disable_bluetooth_desc"
+            android:key="prefs_key_mipad_input_disable_bluetooth_new"
+            android:defaultValue="false" />
+
         <DropDownPreference
             android:key="prefs_key_mipad_input_bluetooth_version"
             android:title="@string/various_mipad_input_bluetooth_version_title"
             android:summary="@string/various_mipad_input_bluetooth_version_desc"
             android:defaultValue="2"
+            android:dependency="prefs_key_mipad_input_disable_bluetooth_new"
             app:entries="@array/mipad_input_bluetooth_version"
             app:entryValues="@array/mipad_input_bluetooth_version_value" />