adj: 调整安全服务部分功能的显示逻辑，修改了部分源字符串

Author: lingqiqi5211

app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter.java

@@ -22,7 +22,6 @@
 
 import com.sevtinge.hyperceiler.module.base.BaseModule;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.AppLockPinScramble;
-import com.sevtinge.hyperceiler.module.hook.securitycenter.BlurSecurity;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.DisableReport;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.GetBubbleAppString;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.InstallIntercept;
@@ -59,6 +58,7 @@
 import com.sevtinge.hyperceiler.module.hook.securitycenter.other.NoLowBatteryWarning;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.other.SkipCountDownLimit;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.AddSideBarExpandReceiver;
+import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.BlurSecurity;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.game.GamePerformanceWildMode;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.game.RemoveMacroBlackList;
 import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.game.UnlockGunService;

app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SecurityCenterFragment.java

@@ -33,13 +33,14 @@
 import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment;
 
 import moralnorm.preference.Preference;
+import moralnorm.preference.PreferenceCategory;
 import moralnorm.preference.SwitchPreference;
 
 public class SecurityCenterFragment extends SettingsPreferenceFragment {
     String mSecurity;
     SwitchPreference mAiClipboard;
     SwitchPreference mBlurLocation;
-    SwitchPreference mGetNumber;
+    PreferenceCategory mPrivacy;
     Preference mNewboxBackgroundCustom;
 
     @Override
@@ -62,41 +63,42 @@ public void initPrefs() {
 
         mBlurLocation = findPreference("prefs_key_security_center_blur_location");
         mAiClipboard = findPreference("prefs_key_security_center_ai_clipboard");
-        mGetNumber = findPreference("prefs_key_security_center_get_number");
 
+        mPrivacy = findPreference("prefs_key_security_center_privacy");
         mNewboxBackgroundCustom = findPreference("prefs_key_security_center_newbox_bg_custom");
 
-        if (permission != PermissionChecker.PERMISSION_GRANTED) {
-            mBlurLocation.setSummary(R.string.security_center_no_permission);
-            mAiClipboard.setSummary(R.string.security_center_no_permission);
-            mBlurLocation.setEnabled(false);
-            mAiClipboard.setEnabled(false);
-        } else {
+        if (!isMoreHyperOSVersion(1f)) {
+            if (permission != PermissionChecker.PERMISSION_GRANTED) {
+                mBlurLocation.setSummary(R.string.security_center_no_permission);
+                mAiClipboard.setSummary(R.string.security_center_no_permission);
+                mBlurLocation.setEnabled(false);
+                mAiClipboard.setEnabled(false);
+            } else {
+                boolean mBlurLocationEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_blur_location_enable", 0) == 1;
+                boolean mAiClipboardEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_ai_clipboard_enable", 0) == 1;
+
+                mBlurLocation.setChecked(mBlurLocationEnable);
+                mAiClipboard.setChecked(mAiClipboardEnable);
+            }
+
             boolean mBlurLocationEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_blur_location_enable", 0) == 1;
             boolean mAiClipboardEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_ai_clipboard_enable", 0) == 1;
 
             mBlurLocation.setChecked(mBlurLocationEnable);
             mAiClipboard.setChecked(mAiClipboardEnable);
-        }
-
-        mGetNumber.setVisible(!isMoreHyperOSVersion(1f));
 
-        boolean mBlurLocationEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_blur_location_enable", 0) == 1;
-        boolean mAiClipboardEnable = Settings.Secure.getInt(getContext().getContentResolver(), "mi_lab_ai_clipboard_enable", 0) == 1;
-
-        mBlurLocation.setChecked(mBlurLocationEnable);
-        mAiClipboard.setChecked(mAiClipboardEnable);
-
-        mBlurLocation.setOnPreferenceChangeListener((preference, o) -> {
-            Settings.Secure.putInt(getContext().getContentResolver(), "mi_lab_blur_location_enable", (Boolean) o ? 1 : 0);
-            return true;
-        });
-
-        mAiClipboard.setOnPreferenceChangeListener((preference, o) -> {
-            Settings.Secure.putInt(getContext().getContentResolver(), "mi_lab_ai_clipboard_enable", (Boolean) o ? 1 : 0);
-            return true;
-        });
+            mBlurLocation.setOnPreferenceChangeListener((preference, o) -> {
+                Settings.Secure.putInt(getContext().getContentResolver(), "mi_lab_blur_location_enable", (Boolean) o ? 1 : 0);
+                return true;
+            });
 
+            mAiClipboard.setOnPreferenceChangeListener((preference, o) -> {
+                Settings.Secure.putInt(getContext().getContentResolver(), "mi_lab_ai_clipboard_enable", (Boolean) o ? 1 : 0);
+                return true;
+            });
+        } else {
+            mPrivacy.setVisible(!isMoreHyperOSVersion(1f));
+        }
     }
 
     @Override

app/src/main/res/values-zh-rCN/strings.xml

@@ -652,7 +652,7 @@
     <string name="system_ui_status_bar_icon_roaming">隐藏漫游图标</string>
     <string name="system_ui_status_bar_icon_vowifi">隐藏 VoWiFi 图标</string>
     <string name="system_ui_status_bar_icon_volte">隐藏 VoLTE 图标</string>
-    <string name="system_ui_status_bar_icon_headset">耳机</string>
+    <string name="system_ui_status_bar_icon_headset">有线耳机</string>
     <string name="system_ui_status_bar_icon_volume">静音</string>
     <string name="system_ui_status_bar_icon_data_saver">流量节省</string>
     <string name="system_ui_status_bar_icon_zen">勿扰</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -590,7 +590,7 @@
     <string name="system_ui_status_bar_icon_roaming">隱藏漫遊圖示</string>
     <string name="system_ui_status_bar_icon_vowifi">隱藏 VoWiFi 圖示</string>
     <string name="system_ui_status_bar_icon_volte">隱藏 VoLTE 圖示</string>
-    <string name="system_ui_status_bar_icon_headset">耳機</string>
+    <string name="system_ui_status_bar_icon_headset">有線耳機</string>
     <string name="system_ui_status_bar_icon_volume">音量</string>
     <string name="system_ui_status_bar_icon_data_saver">數據節省模式</string>
     <string name="system_ui_status_bar_icon_zen">免打擾模式</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -590,7 +590,7 @@
     <string name="system_ui_status_bar_icon_roaming">隱藏漫遊圖示</string>
     <string name="system_ui_status_bar_icon_vowifi">隱藏 VoWiFi 圖示</string>
     <string name="system_ui_status_bar_icon_volte">隱藏 VoLTE 圖示</string>
-    <string name="system_ui_status_bar_icon_headset">耳機</string>
+    <string name="system_ui_status_bar_icon_headset">有線耳機</string>
     <string name="system_ui_status_bar_icon_volume">音量</string>
     <string name="system_ui_status_bar_icon_data_saver">數據節省模式</string>
     <string name="system_ui_status_bar_icon_zen">免打擾模式</string>

app/src/main/res/values/strings.xml

@@ -640,7 +640,7 @@
     <string name="system_ui_status_bar_icon_roaming">Hide roaming icon</string>
     <string name="system_ui_status_bar_icon_vowifi">Hide VoWiFi icon</string>
     <string name="system_ui_status_bar_icon_volte">Hide VoLTE icon</string>
-    <string name="system_ui_status_bar_icon_headset">Headset</string>
+    <string name="system_ui_status_bar_icon_headset">Wired Headphones</string>
     <string name="system_ui_status_bar_icon_volume">Volume</string>
     <string name="system_ui_status_bar_icon_data_saver">Data Saver</string>
     <string name="system_ui_status_bar_icon_zen">Zen</string>

app/src/main/res/xml/security_center.xml

@@ -92,7 +92,9 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/security_center_privacy_title">
+    <PreferenceCategory
+        android:key="prefs_key_security_center_privacy"
+        android:title="@string/security_center_privacy_title">
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_security_center_ai_clipboard"
@@ -108,12 +110,6 @@
             android:key="prefs_key_security_center_get_number"
             android:title="@string/security_center_get_number" />
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="prefs_key_security_center_applock_pin_scramble"
-            android:summary="@string/security_center_applock_pin_scramble_desc"
-            android:title="@string/security_center_applock_pin_scramble" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/security_center_beauty_title">
@@ -231,6 +227,12 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/security_center_other_title">
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="prefs_key_security_center_applock_pin_scramble"
+            android:summary="@string/security_center_applock_pin_scramble_desc"
+            android:title="@string/security_center_applock_pin_scramble" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_security_center_score"
@@ -274,8 +276,7 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_security_center_disable_send_malicious_app_notification"
-            android:title="@string/security_center_disable_send_malicious_app_notification"
-            app:isPreferenceVisible="true" />
+            android:title="@string/security_center_disable_send_malicious_app_notification" />
 
         <SwitchPreference
             android:defaultValue="false"
@@ -291,5 +292,4 @@
             android:title="@string/security_center_bypass_simlock_miaccount_auth" />
 
     </PreferenceCategory>
-
 </PreferenceScreen>