Merge pull request #11056 from t895/new-bars

Android: Add more top app bars

2 files changed, 32 insertions, 0 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java
index e2ee9ae353..63478fee0b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java
@@ -8,6 +8,9 @@ import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
+
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.fragments.ConvertFragment;
 import org.dolphinemu.dolphinemu.utils.ThemeHelper;
@@ -41,5 +44,18 @@ public class ConvertActivity extends AppCompatActivity
       fragment = ConvertFragment.newInstance(path);
       getSupportFragmentManager().beginTransaction().add(R.id.fragment_convert, fragment).commit();
     }
+
+    MaterialToolbar tb = findViewById(R.id.toolbar_convert);
+    CollapsingToolbarLayout ctb = findViewById(R.id.toolbar_convert_layout);
+    ctb.setTitle(getString(R.string.convert_convert));
+    setSupportActionBar(tb);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
+  @Override
+  public boolean onSupportNavigateUp()
+  {
+    onBackPressed();
+    return true;
   }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
index 4cc014d646..70487da0b9 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -12,6 +12,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
+
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
 import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
@@ -77,6 +80,12 @@ public class RiivolutionBootActivity extends AppCompatActivity
       patches.loadConfig();
       runOnUiThread(() -> populateList(patches));
     }).start();
+
+    MaterialToolbar tb = findViewById(R.id.toolbar_riivolution);
+    CollapsingToolbarLayout ctb = findViewById(R.id.toolbar_riivolution_layout);
+    ctb.setTitle(getString(R.string.riivolution_riivolution));
+    setSupportActionBar(tb);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
   }
 
   @Override
@@ -88,6 +97,13 @@ public class RiivolutionBootActivity extends AppCompatActivity
       mPatches.saveConfig();
   }
 
+  @Override
+  public boolean onSupportNavigateUp()
+  {
+    onBackPressed();
+    return true;
+  }
+
   private void populateList(RiivolutionPatches patches)
   {
     mPatches = patches;