diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp
index 5efb3d45..6ffa175b 100644
--- a/base/vulkanexamplebase.cpp
+++ b/base/vulkanexamplebase.cpp
@@ -368,6 +368,34 @@ void VulkanExampleBase::renderLoop()
 		if (prepared)
 		{
 			render();
+			// Check gamepad state
+			const float deadZone = 0.10f;
+			// todo : check if gamepad is present
+			// todo : time based and relative axis positions
+			bool updateView = false;
+			// Rotate
+			if (abs(gamePadState.axes.x) > deadZone)
+			{
+				rotation.y += gamePadState.axes.x * 0.25f * rotationSpeed;
+				updateView = true;
+			}
+			if (abs(gamePadState.axes.y) > deadZone)
+			{
+				rotation.x -= gamePadState.axes.y * 0.25f * rotationSpeed;
+				updateView = true;
+			}
+			// Zoom
+			if (abs(gamePadState.axes.rz) > deadZone)
+			{
+				zoom -= gamePadState.axes.rz * 0.005f * zoomSpeed;
+				updateView = true;
+			}
+			if (updateView)
+			{
+				viewChanged();
+			}
+
+
 		}
 	}
 #elif defined(__linux__)
@@ -892,6 +920,27 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
 	}
 }
 #elif defined(__ANDROID__)
+int32_t VulkanExampleBase::handleAppInput(struct android_app* app, AInputEvent* event)
+{
+	VulkanExampleBase* vulkanExample = (VulkanExampleBase*)app->userData;
+	if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION)
+	{
+		if (AInputEvent_getSource(event) == AINPUT_SOURCE_JOYSTICK)
+		{
+			vulkanExample->gamePadState.axes.x = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_X, 0);
+			vulkanExample->gamePadState.axes.y = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Y, 0);
+			vulkanExample->gamePadState.axes.z = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Z, 0);
+			vulkanExample->gamePadState.axes.rz = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RZ, 0);
+		}
+		else
+		{
+			// todo : touch input
+		}
+		return 1;
+	}
+	return 0;
+}
+
 void VulkanExampleBase::handleAppCommand(android_app * app, int32_t cmd)
 {
 	assert(app->userData != NULL);
diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h
index e33b6d63..48aef9e5 100644
--- a/base/vulkanexamplebase.h
+++ b/base/vulkanexamplebase.h
@@ -158,6 +158,17 @@ public:
 #elif defined(__ANDROID__)
 	android_app* androidApp;
 	bool animating = true;
+	// Gamepad state (only one)
+	struct
+	{
+		struct
+		{
+			float x = 0.0f;
+			float y = 0.0f;
+			float z = 0.0f;
+			float rz = 0.0f;
+		} axes;
+	} gamePadState;
 #elif defined(__linux__)
 	struct {
 		bool left = false;
@@ -182,6 +193,7 @@ public:
 	HWND setupWindow(HINSTANCE hinstance, WNDPROC wndproc);
 	void handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 #elif defined(__ANDROID__)
+	static int32_t handleAppInput(struct android_app* app, AInputEvent* event);
 	static void handleAppCommand(android_app* app, int32_t cmd);
 #elif defined(__linux__)
 	xcb_window_t setupWindow();
diff --git a/triangle/triangle.cpp b/triangle/triangle.cpp
index d0e2d75a..85e7db47 100644
--- a/triangle/triangle.cpp
+++ b/triangle/triangle.cpp
@@ -927,6 +927,7 @@ int main(const int argc, const char *argv[])
 	// Attach vulkan example to global android application state
 	state->userData = vulkanExample;
 	state->onAppCmd = VulkanExample::handleAppCommand;
+	state->onInputEvent = VulkanExample::handleAppInput;
 	vulkanExample->androidApp = state;
 #elif defined(__linux__)
 	vulkanExample->setupWindow();