From 56fb1e0549a2dbfa45471aba39d7cb2c91f6ea08 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 23 Jul 2019 17:47:01 -0400
Subject: [PATCH] android: frontend: Remove "Toggle All" option from toggle
 controls.

- This was broken, and is not terribly useful as-is.
---
 .../activities/EmulationActivity.java           |  3 ---
 .../fragments/EmulationFragment.java            | 17 -----------------
 src/android/app/src/main/res/values/strings.xml |  1 -
 3 files changed, 21 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
index dd00ce396..5c2d3cb21 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
@@ -507,9 +507,6 @@ public final class EmulationActivity extends AppCompatActivity {
                 (dialog, indexSelected, isChecked) -> editor
                         .putBoolean("buttonToggle" + indexSelected, isChecked));
 
-
-        builder.setNeutralButton(getString(R.string.emulation_toggle_all),
-                (dialogInterface, i) -> mEmulationFragment.toggleInputOverlayVisibility());
         builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) ->
         {
             editor.apply();
diff --git a/src/android/app/src/main/java/org/citra/citra_android/fragments/EmulationFragment.java b/src/android/app/src/main/java/org/citra/citra_android/fragments/EmulationFragment.java
index ee1d91d88..3c0b091aa 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/fragments/EmulationFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/fragments/EmulationFragment.java
@@ -178,23 +178,6 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
         DirectoryInitializationService.startService(getActivity());
     }
 
-    public void toggleInputOverlayVisibility() {
-        SharedPreferences.Editor editor = mPreferences.edit();
-
-        // If the overlay is currently set to INVISIBLE
-        if (!mPreferences.getBoolean("showInputOverlay", false)) {
-            // Set it to VISIBLE
-            mInputOverlay.setVisibility(View.VISIBLE);
-            editor.putBoolean("showInputOverlay", true);
-        } else {
-            // Set it to INVISIBLE
-            mInputOverlay.setVisibility(View.GONE);
-            editor.putBoolean("showInputOverlay", false);
-        }
-
-        editor.apply();
-    }
-
     public void refreshInputOverlay() {
         mInputOverlay.refreshControls();
     }
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index f9ff61559..93749c60d 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -149,7 +149,6 @@
     <string name="emulation_edit_layout">Edit Layout</string>
     <string name="emulation_done">Done</string>
     <string name="emulation_toggle_controls">Toggle Controls</string>
-    <string name="emulation_toggle_all">Toggle All</string>
     <string name="emulation_control_scale">Adjust Scale</string>
     <string name="emulation_choose_controller">Choose Controller</string>
     <string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>