diff options
| author | Mai M <mathew1800@gmail.com> | 2022-04-08 20:50:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 20:50:12 -0400 |
| commit | d4e4b5604728d313dcfd00b37a340dc0e400b7e6 (patch) | |
| tree | edbe85e0191904ab6d209afe8f58775c0c5f6570 /Source/Android/app/src/main/java | |
| parent | dcf27b91bafd3ae2f69413ab3faa04b8e295fe3e (diff) | |
| parent | 4120870628f4cacb48dd2b894a0c53b1021cc293 (diff) | |
Merge pull request #10562 from JosJuice/android-double-tap-get
Android: Fix displaying the current value of double tap setting
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 0132aac85f..339339e02a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -879,13 +879,18 @@ public final class EmulationActivity extends AppCompatActivity int buttonList = currentController == InputOverlay.OVERLAY_WIIMOTE_CLASSIC ? R.array.doubleTapWithClassic : R.array.doubleTap; - if (currentController != InputOverlay.OVERLAY_WIIMOTE_CLASSIC && - currentValue == InputOverlay.OVERLAY_WIIMOTE_CLASSIC) + int checkedItem = -1; + int itemCount = getResources().getStringArray(buttonList).length; + for (int i = 0; i < itemCount; i++) { - currentValue = InputOverlay.OVERLAY_WIIMOTE; + if (InputOverlayPointer.DOUBLE_TAP_OPTIONS.get(i) == currentValue) + { + checkedItem = i; + break; + } } - builder.setSingleChoiceItems(buttonList, currentValue, + builder.setSingleChoiceItems(buttonList, checkedItem, (DialogInterface dialog, int which) -> IntSetting.MAIN_DOUBLE_TAP_BUTTON .setInt(mSettings, InputOverlayPointer.DOUBLE_TAP_OPTIONS.get(which))); |