From c5e14c2f9f96130fb1e24b4a550248c8115627f0 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 23 Mar 2021 22:10:14 +1000
Subject: [PATCH] Android: Remove title from toolbar/add open icon

---
 .../com/github/stenzek/duckstation/MainActivity.java  |  1 +
 .../res/drawable/ic_baseline_insert_drive_file_24.xml | 11 +++++++++++
 android/app/src/main/res/menu/menu_main.xml           |  4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 android/app/src/main/res/drawable/ic_baseline_insert_drive_file_24.xml

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java
index 5adced4c1..4bdfb096f 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java
@@ -143,6 +143,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         loadSettings();
+        setTitle(null);
 
         super.onCreate(savedInstanceState);
 
diff --git a/android/app/src/main/res/drawable/ic_baseline_insert_drive_file_24.xml b/android/app/src/main/res/drawable/ic_baseline_insert_drive_file_24.xml
new file mode 100644
index 000000000..18b306228
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_baseline_insert_drive_file_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/android/app/src/main/res/menu/menu_main.xml b/android/app/src/main/res/menu/menu_main.xml
index 9054ee4b1..b8346d706 100644
--- a/android/app/src/main/res/menu/menu_main.xml
+++ b/android/app/src/main/res/menu/menu_main.xml
@@ -5,7 +5,9 @@
     <group android:id="@+id/start_menu">
         <item
             android:id="@+id/action_start_file"
-            android:title="@string/menu_main_start_file" />
+            android:icon="@drawable/ic_baseline_insert_drive_file_24"
+            android:title="@string/menu_main_start_file"
+            app:showAsAction="always" />
         <item
             android:id="@+id/action_start_bios"
             android:title="@string/menu_main_start_bios" />