From 3f4460969866d33a2f5c6d96728c908e00430fb3 Mon Sep 17 00:00:00 2001
From: SachinVin <sachinvinayak2000@gmail.com>
Date: Sat, 13 Jun 2020 13:43:31 +0530
Subject: [PATCH] android : refactor button_manager{.cpp, .h} to input_manager

 Now that it also handles sensors
---
 src/android/app/src/main/jni/CMakeLists.txt                   | 4 ++--
 src/android/app/src/main/jni/config.cpp                       | 2 +-
 src/android/app/src/main/jni/emu_window/emu_window.cpp        | 2 +-
 .../src/main/jni/{button_manager.cpp => input_manager.cpp}    | 2 +-
 .../app/src/main/jni/{button_manager.h => input_manager.h}    | 0
 src/android/app/src/main/jni/native.cpp                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/android/app/src/main/jni/{button_manager.cpp => input_manager.cpp} (99%)
 rename src/android/app/src/main/jni/{button_manager.h => input_manager.h} (100%)

diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt
index ebf7de8a9..3fd3a3eab 100644
--- a/src/android/app/src/main/jni/CMakeLists.txt
+++ b/src/android/app/src/main/jni/CMakeLists.txt
@@ -3,8 +3,8 @@ add_library(main SHARED
     applets/mii_selector.h
     applets/swkbd.cpp
     applets/swkbd.h
-    button_manager.cpp
-    button_manager.h
+    input_manager.cpp
+    input_manager.h
     camera/ndk_camera.cpp
     camera/ndk_camera.h
     camera/still_image_camera.cpp
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp
index c4834d1af..8047114b6 100644
--- a/src/android/app/src/main/jni/config.cpp
+++ b/src/android/app/src/main/jni/config.cpp
@@ -17,10 +17,10 @@
 #include "core/settings.h"
 #include "input_common/main.h"
 #include "input_common/udp/client.h"
-#include "jni/button_manager.h"
 #include "jni/camera/ndk_camera.h"
 #include "jni/config.h"
 #include "jni/default_ini.h"
+#include "jni/input_manager.h"
 
 Config::Config() {
     // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cpp
index b2f39d8ac..71a5ff633 100644
--- a/src/android/app/src/main/jni/emu_window/emu_window.cpp
+++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp
@@ -13,9 +13,9 @@
 #include "common/logging/log.h"
 #include "core/settings.h"
 #include "input_common/main.h"
-#include "jni/button_manager.h"
 #include "jni/emu_window/emu_window.h"
 #include "jni/id_cache.h"
+#include "jni/input_manager.h"
 #include "network/network.h"
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"
diff --git a/src/android/app/src/main/jni/button_manager.cpp b/src/android/app/src/main/jni/input_manager.cpp
similarity index 99%
rename from src/android/app/src/main/jni/button_manager.cpp
rename to src/android/app/src/main/jni/input_manager.cpp
index ceb0df0c6..ce44f6aea 100644
--- a/src/android/app/src/main/jni/button_manager.cpp
+++ b/src/android/app/src/main/jni/input_manager.cpp
@@ -14,7 +14,7 @@
 #include "common/param_package.h"
 #include "input_common/main.h"
 #include "input_common/sdl/sdl.h"
-#include "jni/button_manager.h"
+#include "jni/input_manager.h"
 #include "jni/ndk_motion.h"
 
 namespace InputManager {
diff --git a/src/android/app/src/main/jni/button_manager.h b/src/android/app/src/main/jni/input_manager.h
similarity index 100%
rename from src/android/app/src/main/jni/button_manager.h
rename to src/android/app/src/main/jni/input_manager.h
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 80596450d..1b4e39f30 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -26,7 +26,6 @@
 #include "core/settings.h"
 #include "jni/applets/mii_selector.h"
 #include "jni/applets/swkbd.h"
-#include "jni/button_manager.h"
 #include "jni/camera/ndk_camera.h"
 #include "jni/camera/still_image_camera.h"
 #include "jni/config.h"
@@ -34,6 +33,7 @@
 #include "jni/game_info.h"
 #include "jni/game_settings.h"
 #include "jni/id_cache.h"
+#include "jni/input_manager.h"
 #include "jni/mic.h"
 #include "jni/native.h"
 #include "jni/ndk_motion.h"