From 7775774761263b245b80ff52a3fd5e94aa9a7050 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 11 Oct 2020 14:39:14 +1000
Subject: [PATCH] Android: Fix game controller input being ignored

---
 .../com/github/stenzek/duckstation/EmulationActivity.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
index 32b299b28..f19503a95 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
@@ -182,6 +182,8 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
 
         mContentView = findViewById(R.id.fullscreen_content);
         mContentView.getHolder().addCallback(this);
+        mContentView.setFocusable(true);
+        mContentView.requestFocus();
 
         // Hook up controller input.
         updateControllers();
@@ -254,6 +256,8 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
                         View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
                         View.SYSTEM_UI_FLAG_FULLSCREEN |
                         View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+        if (mContentView != null)
+            mContentView.requestFocus();
     }
 
     private static final int REQUEST_CODE_SETTINGS = 0;