summaryrefslogtreecommitdiff
path: root/Source/Android/app/src
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-06-08 19:37:33 -0400
committerRyan Houdek <Sonicadvance1@gmail.com>2015-06-08 19:37:33 -0400
commita91c152b8653c75880dbd3f23630d46563cf047b (patch)
tree4197151edb063d55b70cec31c052ec69a86d658a /Source/Android/app/src
parent2282be3265c8b9b036c2ef598b519f43a563fffc (diff)
parentf80f4bb5423b5a5034d69538f295fb7df2390a37 (diff)
Merge pull request #2572 from sigmabeta/android-show-version
Android: Show the version name as a subtitle in the GameGridActivity.
Diffstat (limited to 'Source/Android/app/src')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
index 9e0bc40366..cbb4ab8058 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
@@ -19,6 +19,7 @@ import android.view.View;
import android.widget.ImageButton;
import android.widget.Toolbar;
+import org.dolphinemu.dolphinemu.NativeLibrary;
import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.adapters.GameAdapter;
import org.dolphinemu.dolphinemu.model.GameDatabase;
@@ -50,9 +51,10 @@ public final class GameGridActivity extends Activity implements LoaderManager.Lo
ImageButton buttonAddDirectory = (ImageButton) findViewById(R.id.button_add_directory);
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.grid_games);
- // use this setting to improve performance if you know that changes
- // in content do not change the layout size of the RecyclerView
- //mRecyclerView.setHasFixedSize(true);
+ // TODO Rather than calling into native code, this should use the commented line below.
+ // String versionName = BuildConfig.VERSION_NAME;
+ String versionName = NativeLibrary.GetVersionString();
+ toolbar.setSubtitle(versionName);
// Specifying the LayoutManager determines how the RecyclerView arranges views.
RecyclerView.LayoutManager layoutManager = new GridLayoutManager(this,