DO NOT MERGE Always show custom zen vis eff option

+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest

src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java

@@ -28,7 +28,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
 public class ZenModeVisEffectsCustomPreferenceController
         extends AbstractZenModePreferenceController {
 
-    protected boolean mShowMenuSelected;
     protected static final int INTERRUPTIVE_EFFECTS = Policy.SUPPRESSED_EFFECT_AMBIENT
             | Policy.SUPPRESSED_EFFECT_PEEK
             | Policy.SUPPRESSED_EFFECT_LIGHTS
@@ -41,11 +40,7 @@ public class ZenModeVisEffectsCustomPreferenceController
 
     @Override
     public boolean isAvailable() {
-        if (mShowMenuSelected) {
-            return true;
-        }
-
-        return areCustomOptionsSelected();
+        return true;
     }
 
     @Override
@@ -64,10 +59,6 @@ public class ZenModeVisEffectsCustomPreferenceController
         });
     }
 
-    protected void setShownByMenu(boolean shown) {
-        mShowMenuSelected = shown;
-    }
-
     protected boolean areCustomOptionsSelected() {
         boolean allEffectsSuppressed =
                 Policy.areAllVisualEffectsSuppressed(mBackend.mPolicy.suppressedVisualEffects);