app: optimization systemui-ctrlcenter show logic

Author: Sevtinge

app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/ControlCenterSettings.java

@@ -63,6 +63,7 @@ public class ControlCenterSettings extends SettingsPreferenceFragment implements
     SwitchPreference mMusicCtrlPanelMix;
 
     SwitchPreference mTaplus;
+    SwitchPreference mNotifrowmenu;
     Handler handler;
 
     // 临时的，旧控制中心
@@ -99,6 +100,7 @@ public void initPrefs() {
         mTaplus = findPreference("prefs_key_security_center_taplus");
         mThemeBlur = findPreference("prefs_key_system_ui_control_center_unlock_blur_supported");
         mMusicCtrlPanelMix = findPreference("prefs_key_system_ui_control_center_media_control_panel_background_mix");
+        mNotifrowmenu = findPreference("prefs_key_system_ui_control_center_notifrowmenu");
         handler = new Handler();
 
         mExpandNotification.setOnPreferenceClickListener(
@@ -130,6 +132,7 @@ public void initPrefs() {
         mThemeBlur.setVisible(isMoreHyperOSVersion(1f));
         mRoundedRectRadius.setVisible(PrefsUtils.getSharedBoolPrefs(getContext(), "prefs_key_system_ui_control_center_rounded_rect", false) && isMoreHyperOSVersion(1f));
         mMusicCtrlPanelMix.setVisible(isMoreHyperOSVersion(1f));
+        mNotifrowmenu.setVisible(!isMoreHyperOSVersion(1f));
 
         mOldCCGrid = findPreference("prefs_key_system_control_center_old_enable");
         mOldCCGrid1 = findPreference("prefs_key_system_control_center_old_enable_1");

app/src/main/res/xml/system_ui_control_center.xml

@@ -62,11 +62,6 @@
             android:summary="@string/system_ui_control_center_notification_disable_transparent_desc"
             android:title="@string/system_ui_control_center_notification_disable_transparent" />
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="prefs_key_system_ui_control_center_media_control_panel_background_mix"
-            android:title="@string/system_ui_control_center_media_control_panel_background_mix" />
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_n_enable"
@@ -130,14 +125,12 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:dependency="prefs_key_system_ui_control_center_media_control_panel_background_mix"
-        android:title="@string/system_ui_controlcenter_media_card_title">
+    <PreferenceCategory android:title="@string/system_ui_controlcenter_media_card_title">
+
         <SwitchPreference
             android:defaultValue="false"
-            android:disableDependentsState="true"
-            android:key="prefs_key_system_ui_control_center_remove_media_control_panel_background"
-            android:title="@string/system_ui_control_center_remove_media_control_panel_background" />
+            android:key="prefs_key_system_ui_control_center_media_control_panel_background_mix"
+            android:title="@string/system_ui_control_center_media_control_panel_background_mix" />
 
         <SeekBarPreferenceEx
             android:defaultValue="40"
@@ -148,8 +141,16 @@
             app:maxValue="150"
             app:minValue="0"
             app:showSeekBarValue="true"
+            android:dependency="prefs_key_system_ui_control_center_media_control_panel_background_mix"
             app:stepValue="1" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:disableDependentsState="true"
+            android:dependency="prefs_key_system_ui_control_center_media_control_panel_background_mix"
+            android:key="prefs_key_system_ui_control_center_remove_media_control_panel_background"
+            android:title="@string/system_ui_control_center_remove_media_control_panel_background" />
+
         <SeekBarPreferenceEx
             android:defaultValue="20"
             android:dependency="prefs_key_system_ui_control_center_remove_media_control_panel_background"