From 7c14996e3e24b0a4a1064ece1c656bcbe6c923c7 Mon Sep 17 00:00:00 2001
From: sigmabeta <bastos.eder@gmail.com>
Date: Tue, 14 Jul 2015 22:35:52 -0400
Subject: [PATCH 1/4] Android TV: Implement game selector activity in new
 Android TV UI

---
 Source/Android/app/build.gradle               |   6 +-
 .../Android/app/src/main/AndroidManifest.xml  |  13 +-
 .../dolphinemu/activities/MainActivity.java   |   2 +-
 .../dolphinemu/activities/TvMainActivity.java | 141 ++++++++++++++++++
 .../dolphinemu/adapters/GamePresenter.java    | 122 +++++++++++++++
 .../org/dolphinemu/dolphinemu/model/Game.java |  33 +---
 .../viewholders/TvGameViewHolder.java         |  40 +++++
 .../src/main/res/layout/activity_tv_main.xml  |  13 ++
 .../app/src/main/res/layout/card_game.xml     |   1 -
 .../app/src/main/res/values/colors.xml        |   2 +
 .../app/src/main/res/values/styles.xml        |  15 ++
 11 files changed, 358 insertions(+), 30 deletions(-)
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
 create mode 100644 Source/Android/app/src/main/res/layout/activity_tv_main.xml

diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
index 8f5ce60a76..9668d8af95 100644
--- a/Source/Android/app/build.gradle
+++ b/Source/Android/app/build.gradle
@@ -1,7 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    // Leanback support requires >22
+    compileSdkVersion 22
     buildToolsVersion "22.0.1"
 
     lintOptions {
@@ -80,6 +81,9 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:22.2.0'
     compile 'com.android.support:design:22.2.0'
 
+    // Android TV UI libraries.
+    compile 'com.android.support:leanback-v17:22.2.0'
+
     // For showing the banner as a circle a-la Material Design Guidelines
     compile 'de.hdodenhof:circleimageview:1.2.2'
 
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 30fffd11e9..e08b2dd0a8 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -33,11 +33,22 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.TvMainActivity"
+            android:theme="@style/DolphinTvGamecube">
+
+            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".activities.AddDirectoryActivity"
             android:theme="@style/DolphinGamecube"
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
index 33cd0b0c15..a32b65d566 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
@@ -226,7 +226,7 @@ public final class MainActivity extends AppCompatActivity implements LoaderManag
 						GameProvider.URI_GAME,                        // URI of table to query
 						null,                                        // Return all columns
 						GameDatabase.KEY_GAME_PLATFORM + " = ?",    // Select by platform
-						new String[]{Integer.toString(id)},    // Platform id is Loader id minus 1
+						new String[]{Integer.toString(id)},    // Platform id is Loader id
 						GameDatabase.KEY_GAME_TITLE + " asc"        // Sort by game name, ascending order
 				);
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
new file mode 100644
index 0000000000..2c191bdaf0
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
@@ -0,0 +1,141 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.app.FragmentManager;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.support.v17.leanback.app.BrowseFragment;
+import android.support.v17.leanback.database.CursorMapper;
+import android.support.v17.leanback.widget.ArrayObjectAdapter;
+import android.support.v17.leanback.widget.CursorObjectAdapter;
+import android.support.v17.leanback.widget.HeaderItem;
+import android.support.v17.leanback.widget.ListRow;
+import android.support.v17.leanback.widget.ListRowPresenter;
+import android.support.v17.leanback.widget.OnItemViewClickedListener;
+import android.support.v17.leanback.widget.Presenter;
+import android.support.v17.leanback.widget.Row;
+import android.support.v17.leanback.widget.RowPresenter;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.adapters.GamePresenter;
+import org.dolphinemu.dolphinemu.model.Game;
+import org.dolphinemu.dolphinemu.model.GameDatabase;
+import org.dolphinemu.dolphinemu.model.GameProvider;
+import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
+
+public final class TvMainActivity extends Activity
+{
+	protected BrowseFragment mBrowseFragment;
+
+	private ArrayObjectAdapter mRowsAdapter;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_tv_main);
+
+		final FragmentManager fragmentManager = getFragmentManager();
+		mBrowseFragment = (BrowseFragment) fragmentManager.findFragmentById(
+				R.id.fragment_game_list);
+
+		// Set display parameters for the BrowseFragment
+		mBrowseFragment.setHeadersState(BrowseFragment.HEADERS_ENABLED);
+		mBrowseFragment.setTitle(getString(R.string.app_name));
+		mBrowseFragment.setBadgeDrawable(getResources().getDrawable(
+				R.drawable.ic_launcher, null));
+		mBrowseFragment.setBrandColor(getResources().getColor(R.color.dolphin_blue_dark));
+
+		buildRowsAdapter();
+
+		mBrowseFragment.setOnItemViewClickedListener(
+				new OnItemViewClickedListener()
+				{
+					@Override
+					public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row)
+					{
+						TvGameViewHolder holder = (TvGameViewHolder) itemViewHolder;
+						// Start the emulation activity and send the path of the clicked ISO to it.
+						Intent intent = new Intent(TvMainActivity.this, EmulationActivity.class);
+
+						intent.putExtra("SelectedGame", holder.path);
+						intent.putExtra("SelectedTitle", holder.title);
+						intent.putExtra("ScreenPath", holder.screenshotPath);
+
+						ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
+								TvMainActivity.this,
+								holder.imageScreenshot,
+								"image_game_screenshot");
+
+						startActivity(intent, options.toBundle());
+					}
+				});
+	}
+
+	private void buildRowsAdapter()
+	{
+		mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
+
+		// For each row
+		for (int platformIndex = 0; platformIndex <= Game.PLATFORM_WII_WARE; ++platformIndex)
+		{
+			// Create an adapter for this row.
+			CursorObjectAdapter row = new CursorObjectAdapter(new GamePresenter(platformIndex));
+
+			// Add items to the adapter.
+			Cursor games = getContentResolver().query(
+					GameProvider.URI_GAME,                        // URI of table to query
+					null,                                        // Return all columns
+					GameDatabase.KEY_GAME_PLATFORM + " = ?",    // Select by platform
+					new String[]{Integer.toString(platformIndex)},    // Platform id
+					GameDatabase.KEY_GAME_TITLE + " asc"        // Sort by game name, ascending order
+			);
+
+			row.swapCursor(games);
+			row.setMapper(new CursorMapper()
+			{
+				@Override
+				protected void bindColumns(Cursor cursor)
+				{
+					// No-op? Not sure what this does.
+				}
+
+				@Override
+				protected Object bind(Cursor cursor)
+				{
+					return Game.fromCursor(cursor);
+				}
+			});
+
+			String headerName;
+			switch (platformIndex)
+			{
+				case Game.PLATFORM_GC:
+					headerName = "GameCube Games";
+					break;
+
+				case Game.PLATFORM_WII:
+					headerName = "Wii Games";
+					break;
+
+				case Game.PLATFORM_WII_WARE:
+					headerName = "WiiWare";
+					break;
+
+				default:
+					headerName = "Error";
+					break;
+			}
+
+			// Create a header for this row.
+			HeaderItem header = new HeaderItem(platformIndex, headerName);
+
+			// Create the row, passing it the filled adapter and the header, and give it to the master adapter.
+			mRowsAdapter.add(new ListRow(header, row));
+		}
+
+		mBrowseFragment.setAdapter(mRowsAdapter);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java
new file mode 100644
index 0000000000..d9b4487278
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java
@@ -0,0 +1,122 @@
+package org.dolphinemu.dolphinemu.adapters;
+
+import android.graphics.Bitmap;
+import android.support.v17.leanback.widget.ImageCardView;
+import android.support.v17.leanback.widget.Presenter;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.squareup.picasso.Picasso;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.model.Game;
+import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
+
+/**
+ * The Leanback library / docs call this a Presenter, but it works very
+ * similarly to a RecyclerView.ViewHolder.
+ */
+public final class GamePresenter extends Presenter
+{
+	private int mPlatform;
+
+	public GamePresenter(int platform)
+	{
+		mPlatform = platform;
+	}
+
+	public ViewHolder onCreateViewHolder(ViewGroup parent)
+	{
+		// Create a new view.
+		ImageCardView gameCard = new ImageCardView(parent.getContext())
+		{
+			@Override
+			public void setSelected(boolean selected)
+			{
+				setCardBackground(this, selected);
+				super.setSelected(selected);
+			}
+		};
+
+		gameCard.setMainImageAdjustViewBounds(true);
+		gameCard.setMainImageDimensions(480, 320);
+		gameCard.setMainImageScaleType(ImageView.ScaleType.CENTER_CROP);
+
+		gameCard.setFocusable(true);
+		gameCard.setFocusableInTouchMode(true);
+
+		setCardBackground(gameCard, false);
+
+		// Use that view to create a ViewHolder.
+		return new TvGameViewHolder(gameCard);
+	}
+
+	public void onBindViewHolder(ViewHolder viewHolder, Object item)
+	{
+		TvGameViewHolder holder = (TvGameViewHolder) viewHolder;
+		Game game = (Game) item;
+
+		String screenPath = game.getScreenshotPath();
+
+		// Fill in the view contents.
+		Picasso.with(holder.imageScreenshot.getContext())
+				.load(screenPath)
+				.fit()
+				.centerCrop()
+				.noFade()
+				.noPlaceholder()
+				.config(Bitmap.Config.RGB_565)
+				.error(R.drawable.no_banner)
+				.into(holder.imageScreenshot);
+
+		holder.cardParent.setTitleText(game.getTitle());
+		holder.cardParent.setContentText(game.getCompany());
+
+		// TODO These shouldn't be necessary once the move to a DB-based model is complete.
+		holder.gameId = game.getGameId();
+		holder.path = game.getPath();
+		holder.title = game.getTitle();
+		holder.description = game.getDescription();
+		holder.country = game.getCountry();
+		holder.company = game.getCompany();
+		holder.screenshotPath = game.getScreenshotPath();
+	}
+
+	public void onUnbindViewHolder(ViewHolder viewHolder)
+	{
+		// no op
+	}
+
+	public void setCardBackground(ImageCardView view, boolean selected)
+	{
+		int backgroundColor;
+
+		if (selected)
+		{
+			switch (mPlatform)
+			{
+				case Game.PLATFORM_GC:
+					backgroundColor = R.color.dolphin_accent_gamecube;
+					break;
+
+				case Game.PLATFORM_WII:
+					backgroundColor = R.color.dolphin_accent_wii;
+					break;
+
+				case Game.PLATFORM_WII_WARE:
+					backgroundColor = R.color.dolphin_accent_wiiware;
+					break;
+
+				default:
+					backgroundColor = android.R.color.holo_red_dark;
+					break;
+			}
+		}
+		else
+		{
+			backgroundColor = R.color.tv_card_unselected;
+		}
+
+		view.setInfoAreaBackgroundColor(view.getResources().getColor(backgroundColor));
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
index f3ef6f7514..2068f01f08 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
@@ -3,8 +3,6 @@ package org.dolphinemu.dolphinemu.model;
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import java.io.File;
-
 public final class Game
 {
 	public static final int PLATFORM_GC = 0;
@@ -33,13 +31,13 @@ public final class Game
 	private String mDescription;
 	private String mPath;
 	private String mGameId;
-	private String mScreenshotFolderPath;
+	private String mScreenshotPath;
 	private String mCompany;
 
 	private int mPlatform;
 	private int mCountry;
 
-	public Game(int platform, String title, String description, int country, String path, String gameId, String company)
+	public Game(int platform, String title, String description, int country, String path, String gameId, String company, String screenshotPath)
 	{
 		mPlatform = platform;
 		mTitle = title;
@@ -48,7 +46,7 @@ public final class Game
 		mPath = path;
 		mGameId = gameId;
 		mCompany = company;
-		mScreenshotFolderPath = PATH_SCREENSHOT_FOLDER + getGameId() + "/";
+		mScreenshotPath = screenshotPath;
 	}
 
 	public int getPlatform()
@@ -86,27 +84,9 @@ public final class Game
 		return mGameId;
 	}
 
-	public String getScreenshotFolderPath()
+	public String getScreenshotPath()
 	{
-		return mScreenshotFolderPath;
-	}
-
-	public String getScreenPath()
-	{
-		// Count how many screenshots are available, so we can use the most recent one.
-		File screenshotFolder = new File(mScreenshotFolderPath.substring(mScreenshotFolderPath.indexOf('s') - 1));
-		int screenCount = 0;
-
-		if (screenshotFolder.isDirectory())
-		{
-			screenCount = screenshotFolder.list().length;
-		}
-
-		String screenPath = mScreenshotFolderPath
-				+ getGameId() + "-"
-				+ screenCount + ".png";
-
-		return screenPath;
+		return mScreenshotPath;
 	}
 
 	public static ContentValues asContentValues(int platform, String title, String description, int country, String path, String gameId, String company)
@@ -135,6 +115,7 @@ public final class Game
 				cursor.getInt(GameDatabase.GAME_COLUMN_COUNTRY),
 				cursor.getString(GameDatabase.GAME_COLUMN_PATH),
 				cursor.getString(GameDatabase.GAME_COLUMN_GAME_ID),
-				cursor.getString(GameDatabase.GAME_COLUMN_COMPANY));
+				cursor.getString(GameDatabase.GAME_COLUMN_COMPANY),
+				cursor.getString(GameDatabase.GAME_COLUMN_SCREENSHOT_PATH));
 	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
new file mode 100644
index 0000000000..dd996ccbe7
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
@@ -0,0 +1,40 @@
+package org.dolphinemu.dolphinemu.viewholders;
+
+import android.support.v17.leanback.widget.ImageCardView;
+import android.support.v17.leanback.widget.Presenter;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * A simple class that stores references to views so that the GameAdapter doesn't need to
+ * keep calling findViewById(), which is expensive.
+ */
+public class TvGameViewHolder extends Presenter.ViewHolder
+{
+	public ImageCardView cardParent;
+
+	public ImageView imageScreenshot;
+	public TextView textGameTitle;
+	public TextView textCompany;
+
+	public String gameId;
+
+	// TODO Not need any of this stuff. Currently only the properties dialog needs it.
+	public String path;
+	public String title;
+	public String description;
+	public int country;
+	public String company;
+	public String screenshotPath;
+
+	public TvGameViewHolder(View itemView)
+	{
+		super(itemView);
+
+		itemView.setTag(this);
+
+		cardParent = (ImageCardView) itemView;
+		imageScreenshot = cardParent.getMainImageView();
+	}
+}
diff --git a/Source/Android/app/src/main/res/layout/activity_tv_main.xml b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
new file mode 100644
index 0000000000..922d874b02
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <fragment
+        android:name="android.support.v17.leanback.app.BrowseFragment"
+        android:id="@+id/fragment_game_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
index 9b172b6871..542969ebd6 100644
--- a/Source/Android/app/src/main/res/layout/card_game.xml
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -33,7 +33,6 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
-            android:layout_toStartOf="@+id/button_details"
             android:ellipsize="end"
             android:lines="1"
             android:maxLines="1"
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index d7b7847125..9052de99d5 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -8,4 +8,6 @@
     <color name="dolphin_accent_gamecube">#651fff</color>
 
     <color name="circle_grey">#bdbdbd</color>
+
+    <color name="tv_card_unselected">#444444</color>
 </resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 76ee1f8f55..dba853f492 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -126,6 +126,21 @@
         <item name="textAllCaps">false</item>
     </style>
 
+    <!-- Android TV Themes -->
+    <style name="DolphinTvBase" parent="Theme.Leanback">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
+
+        <!--enable window content transitions-->
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+    </style>
+
+    <style name="DolphinTvGamecube" parent="DolphinTvBase">
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
     <style name="InGameMenuOption" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>

From 0b1212b77db43376012756c4219156708316810e Mon Sep 17 00:00:00 2001
From: sigmabeta <bastos.eder@gmail.com>
Date: Mon, 20 Jul 2015 20:15:26 -0400
Subject: [PATCH 2/4] Android TV: Add row listing all games

---
 .../dolphinemu/activities/TvMainActivity.java | 145 +++++++++++-------
 .../org/dolphinemu/dolphinemu/model/Game.java |   1 +
 2 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
index 2c191bdaf0..0e716d6503 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
@@ -78,64 +78,105 @@ public final class TvMainActivity extends Activity
 	{
 		mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
 
-		// For each row
-		for (int platformIndex = 0; platformIndex <= Game.PLATFORM_WII_WARE; ++platformIndex)
+		// For each platform
+		for (int platformIndex = 0; platformIndex <= Game.PLATFORM_ALL; ++platformIndex)
 		{
-			// Create an adapter for this row.
-			CursorObjectAdapter row = new CursorObjectAdapter(new GamePresenter(platformIndex));
+			ListRow row = buildGamesRow(platformIndex);
 
-			// Add items to the adapter.
-			Cursor games = getContentResolver().query(
-					GameProvider.URI_GAME,                        // URI of table to query
-					null,                                        // Return all columns
-					GameDatabase.KEY_GAME_PLATFORM + " = ?",    // Select by platform
-					new String[]{Integer.toString(platformIndex)},    // Platform id
-					GameDatabase.KEY_GAME_TITLE + " asc"        // Sort by game name, ascending order
-			);
-
-			row.swapCursor(games);
-			row.setMapper(new CursorMapper()
+			// Add row to the adapter only if it is not empty.
+			if (row != null)
 			{
-				@Override
-				protected void bindColumns(Cursor cursor)
-				{
-					// No-op? Not sure what this does.
-				}
-
-				@Override
-				protected Object bind(Cursor cursor)
-				{
-					return Game.fromCursor(cursor);
-				}
-			});
-
-			String headerName;
-			switch (platformIndex)
-			{
-				case Game.PLATFORM_GC:
-					headerName = "GameCube Games";
-					break;
-
-				case Game.PLATFORM_WII:
-					headerName = "Wii Games";
-					break;
-
-				case Game.PLATFORM_WII_WARE:
-					headerName = "WiiWare";
-					break;
-
-				default:
-					headerName = "Error";
-					break;
+				mRowsAdapter.add(row);
 			}
-
-			// Create a header for this row.
-			HeaderItem header = new HeaderItem(platformIndex, headerName);
-
-			// Create the row, passing it the filled adapter and the header, and give it to the master adapter.
-			mRowsAdapter.add(new ListRow(header, row));
 		}
 
 		mBrowseFragment.setAdapter(mRowsAdapter);
 	}
+
+	private ListRow buildGamesRow(int platform)
+	{
+		// Create an adapter for this row.
+		CursorObjectAdapter row = new CursorObjectAdapter(new GamePresenter(platform));
+
+		Cursor games;
+		if (platform == Game.PLATFORM_ALL)
+		{
+			// Get all games.
+			games = getContentResolver().query(
+					GameProvider.URI_GAME,                        // URI of table to query
+					null,                                        // Return all columns
+					null,                                        // Return all games
+					null,                                        // Return all games
+					GameDatabase.KEY_GAME_TITLE + " asc"        // Sort by game name, ascending order
+			);
+		}
+		else
+		{
+			// Get games for this particular platform.
+			games = getContentResolver().query(
+					GameProvider.URI_GAME,                        // URI of table to query
+					null,                                        // Return all columns
+					GameDatabase.KEY_GAME_PLATFORM + " = ?",    // Select by platform
+					new String[]{Integer.toString(platform)},    // Platform id
+					GameDatabase.KEY_GAME_TITLE + " asc"        // Sort by game name, ascending order
+			);
+		}
+
+		// If cursor is empty, don't return a Row.
+		if (!games.moveToFirst())
+		{
+			return null;
+		}
+
+		row.changeCursor(games);
+		row.setMapper(new CursorMapper()
+		{
+			@Override
+			protected void bindColumns(Cursor cursor)
+			{
+				// No-op? Not sure what this does.
+			}
+
+			@Override
+			protected Object bind(Cursor cursor)
+			{
+				return Game.fromCursor(cursor);
+			}
+		});
+
+		String headerName;
+		switch (platform)
+		{
+			case Game.PLATFORM_GC:
+				headerName = "GameCube Games";
+				break;
+
+			case Game.PLATFORM_WII:
+				headerName = "Wii Games";
+				break;
+
+			case Game.PLATFORM_WII_WARE:
+				headerName = "WiiWare";
+				break;
+
+			case Game.PLATFORM_ALL:
+				headerName = "All Games";
+				break;
+
+			default:
+				headerName = "Error";
+				break;
+		}
+
+		// Create a header for this row.
+		HeaderItem header = new HeaderItem(platform, headerName);
+
+		// Create the row, passing it the filled adapter and the header, and give it to the master adapter.
+		return new ListRow(header, row);
+	}
+
+	/*private ListRow buildSettingsRow()
+	{
+
+	}*/
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
index 2068f01f08..33a9f27c54 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
@@ -8,6 +8,7 @@ public final class Game
 	public static final int PLATFORM_GC = 0;
 	public static final int PLATFORM_WII = 1;
 	public static final int PLATFORM_WII_WARE = 2;
+	public static final int PLATFORM_ALL = 3;
 
 	// Copied from IVolume::ECountry. Update these if that is ever modified.
 	public static final int COUNTRY_EUROPE = 0;

From 245b58124eeca6c6a72f072c10ad5d8dfb9e0d93 Mon Sep 17 00:00:00 2001
From: sigmabeta <bastos.eder@gmail.com>
Date: Mon, 20 Jul 2015 22:46:12 -0400
Subject: [PATCH 3/4] Android TV: Add settings row, enabling access to other
 screens.

---
 .../activities/EmulationActivity.java         |   4 +-
 .../dolphinemu/activities/MainActivity.java   |   3 +-
 .../dolphinemu/activities/TvMainActivity.java | 117 +++++++++++++++---
 ...mePresenter.java => GameRowPresenter.java} |  48 ++++---
 .../adapters/SettingsRowPresenter.java        |  47 +++++++
 .../dolphinemu/model/TvSettingsItem.java      |  31 +++++
 .../viewholders/TvGameViewHolder.java         |   7 +-
 .../viewholders/TvSettingsViewHolder.java     |  23 ++++
 .../app/src/main/res/drawable/ic_add_tv.png   | Bin 0 -> 1708 bytes
 .../src/main/res/drawable/ic_refresh_tv.png   | Bin 0 -> 1969 bytes
 .../src/main/res/drawable/ic_settings_tv.png  | Bin 0 -> 2248 bytes
 11 files changed, 232 insertions(+), 48 deletions(-)
 rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/{GamePresenter.java => GameRowPresenter.java} (81%)
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
 create mode 100644 Source/Android/app/src/main/res/drawable/ic_add_tv.png
 create mode 100644 Source/Android/app/src/main/res/drawable/ic_refresh_tv.png
 create mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_tv.png

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index c4cc9e1f3a..04b5149a0e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -50,8 +50,8 @@ public final class EmulationActivity extends AppCompatActivity
 	private boolean mSystemUiVisible;
 	private boolean mMenuVisible;
 
-	private static Interpolator sDecelerator = new DecelerateInterpolator();
-	private static Interpolator sAccelerator = new AccelerateInterpolator();
+	private static final Interpolator sDecelerator = new DecelerateInterpolator();
+	private static final Interpolator sAccelerator = new AccelerateInterpolator();
 
 	/**
 	 * Handlers are a way to pass a message to an Activity telling it to do something
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
index a32b65d566..9ffa651cc2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
@@ -35,7 +35,7 @@ import org.dolphinemu.dolphinemu.services.AssetCopyService;
  */
 public final class MainActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<Cursor>
 {
-	private static final int REQUEST_ADD_DIRECTORY = 1;
+	public static final int REQUEST_ADD_DIRECTORY = 1;
 	public static final int REQUEST_EMULATE_GAME = 2;
 
 	/**
@@ -139,6 +139,7 @@ public final class MainActivity extends AppCompatActivity implements LoaderManag
 				{
 					fragment.refreshScreenshotAtPosition(resultCode);
 				}
+				break;
 		}
 	}
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
index 0e716d6503..1f58698a7e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
@@ -17,12 +17,15 @@ import android.support.v17.leanback.widget.OnItemViewClickedListener;
 import android.support.v17.leanback.widget.Presenter;
 import android.support.v17.leanback.widget.Row;
 import android.support.v17.leanback.widget.RowPresenter;
+import android.widget.Toast;
 
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.adapters.GamePresenter;
+import org.dolphinemu.dolphinemu.adapters.GameRowPresenter;
+import org.dolphinemu.dolphinemu.adapters.SettingsRowPresenter;
 import org.dolphinemu.dolphinemu.model.Game;
 import org.dolphinemu.dolphinemu.model.GameDatabase;
 import org.dolphinemu.dolphinemu.model.GameProvider;
+import org.dolphinemu.dolphinemu.model.TvSettingsItem;
 import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
 
 public final class TvMainActivity extends Activity
@@ -56,24 +59,88 @@ public final class TvMainActivity extends Activity
 					@Override
 					public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row)
 					{
-						TvGameViewHolder holder = (TvGameViewHolder) itemViewHolder;
-						// Start the emulation activity and send the path of the clicked ISO to it.
-						Intent intent = new Intent(TvMainActivity.this, EmulationActivity.class);
+						// Special case: user clicked on a settings row item.
+						if (item instanceof TvSettingsItem)
+						{
+							TvSettingsItem settingsItem = (TvSettingsItem) item;
 
-						intent.putExtra("SelectedGame", holder.path);
-						intent.putExtra("SelectedTitle", holder.title);
-						intent.putExtra("ScreenPath", holder.screenshotPath);
+							switch (settingsItem.getItemId())
+							{
+								case R.id.menu_refresh:
+									getContentResolver().insert(GameProvider.URI_REFRESH, null);
 
-						ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
-								TvMainActivity.this,
-								holder.imageScreenshot,
-								"image_game_screenshot");
+									// TODO Let the Activity know the data is refreshed in some other, better way.
+									recreate();
+									break;
 
-						startActivity(intent, options.toBundle());
+								case R.id.menu_settings:
+									// Launch the Settings Actvity.
+									Intent settings = new Intent(TvMainActivity.this, SettingsActivity.class);
+									startActivity(settings);
+									break;
+
+								case R.id.button_add_directory:
+									Intent fileChooser = new Intent(TvMainActivity.this, AddDirectoryActivity.class);
+
+									// The second argument to this method is read below in onActivityResult().
+									startActivityForResult(fileChooser, MainActivity.REQUEST_ADD_DIRECTORY);
+
+									break;
+
+								default:
+									Toast.makeText(TvMainActivity.this, "Unimplemented menu option.", Toast.LENGTH_SHORT).show();
+									break;
+							}
+						}
+						else
+						{
+							TvGameViewHolder holder = (TvGameViewHolder) itemViewHolder;
+							// Start the emulation activity and send the path of the clicked ISO to it.
+							Intent intent = new Intent(TvMainActivity.this, EmulationActivity.class);
+
+							intent.putExtra("SelectedGame", holder.path);
+							intent.putExtra("SelectedTitle", holder.title);
+							intent.putExtra("ScreenPath", holder.screenshotPath);
+
+							ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
+									TvMainActivity.this,
+									holder.imageScreenshot,
+									"image_game_screenshot");
+
+							startActivity(intent, options.toBundle());
+						}
 					}
 				});
 	}
 
+	/**
+	 * Callback from AddDirectoryActivity. Applies any changes necessary to the GameGridActivity.
+	 *
+	 * @param requestCode An int describing whether the Activity that is returning did so successfully.
+	 * @param resultCode  An int describing what Activity is giving us this callback.
+	 * @param result      The information the returning Activity is providing us.
+	 */
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent result)
+	{
+		switch (requestCode)
+		{
+			case MainActivity.REQUEST_ADD_DIRECTORY:
+				// If the user picked a file, as opposed to just backing out.
+				if (resultCode == RESULT_OK)
+				{
+					// Sanity check to make sure the Activity that just returned was the AddDirectoryActivity;
+					// other activities might use this callback in the future (don't forget to change Javadoc!)
+					if (requestCode == MainActivity.REQUEST_ADD_DIRECTORY)
+					{
+						// TODO Let the Activity know the data is refreshed in some other, better way.
+						recreate();
+					}
+				}
+				break;
+		}
+	}
+
 	private void buildRowsAdapter()
 	{
 		mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
@@ -90,13 +157,16 @@ public final class TvMainActivity extends Activity
 			}
 		}
 
+		ListRow settingsRow = buildSettingsRow();
+		mRowsAdapter.add(settingsRow);
+
 		mBrowseFragment.setAdapter(mRowsAdapter);
 	}
 
 	private ListRow buildGamesRow(int platform)
 	{
 		// Create an adapter for this row.
-		CursorObjectAdapter row = new CursorObjectAdapter(new GamePresenter(platform));
+		CursorObjectAdapter row = new CursorObjectAdapter(new GameRowPresenter());
 
 		Cursor games;
 		if (platform == Game.PLATFORM_ALL)
@@ -175,8 +245,25 @@ public final class TvMainActivity extends Activity
 		return new ListRow(header, row);
 	}
 
-	/*private ListRow buildSettingsRow()
+	private ListRow buildSettingsRow()
 	{
+		ArrayObjectAdapter rowItems = new ArrayObjectAdapter(new SettingsRowPresenter());
 
-	}*/
+		rowItems.add(new TvSettingsItem(R.id.menu_refresh,
+				R.drawable.ic_refresh_tv,
+				R.string.grid_menu_refresh));
+
+		rowItems.add(new TvSettingsItem(R.id.menu_settings,
+				R.drawable.ic_settings_tv,
+				R.string.grid_menu_settings));
+
+		rowItems.add(new TvSettingsItem(R.id.button_add_directory,
+				R.drawable.ic_add_tv,
+				R.string.add_directory_title));
+
+		// Create a header for this row.
+		HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings));
+
+		return new ListRow(header, rowItems);
+	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
similarity index 81%
rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
index d9b4487278..3b0b8095ce 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GamePresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
@@ -16,15 +16,8 @@ import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
  * The Leanback library / docs call this a Presenter, but it works very
  * similarly to a RecyclerView.ViewHolder.
  */
-public final class GamePresenter extends Presenter
+public final class GameRowPresenter extends Presenter
 {
-	private int mPlatform;
-
-	public GamePresenter(int platform)
-	{
-		mPlatform = platform;
-	}
-
 	public ViewHolder onCreateViewHolder(ViewGroup parent)
 	{
 		// Create a new view.
@@ -80,6 +73,25 @@ public final class GamePresenter extends Presenter
 		holder.country = game.getCountry();
 		holder.company = game.getCompany();
 		holder.screenshotPath = game.getScreenshotPath();
+
+		switch (game.getPlatform())
+		{
+			case Game.PLATFORM_GC:
+				holder.cardParent.setTag(R.color.dolphin_accent_gamecube);
+				break;
+
+			case Game.PLATFORM_WII:
+				holder.cardParent.setTag(R.color.dolphin_accent_wii);
+				break;
+
+			case Game.PLATFORM_WII_WARE:
+				holder.cardParent.setTag(R.color.dolphin_accent_wiiware);
+				break;
+
+			default:
+				holder.cardParent.setTag(android.R.color.holo_red_dark);
+				break;
+		}
 	}
 
 	public void onUnbindViewHolder(ViewHolder viewHolder)
@@ -93,24 +105,8 @@ public final class GamePresenter extends Presenter
 
 		if (selected)
 		{
-			switch (mPlatform)
-			{
-				case Game.PLATFORM_GC:
-					backgroundColor = R.color.dolphin_accent_gamecube;
-					break;
-
-				case Game.PLATFORM_WII:
-					backgroundColor = R.color.dolphin_accent_wii;
-					break;
-
-				case Game.PLATFORM_WII_WARE:
-					backgroundColor = R.color.dolphin_accent_wiiware;
-					break;
-
-				default:
-					backgroundColor = android.R.color.holo_red_dark;
-					break;
-			}
+			// TODO: 7/20/15 Try using view tag to set color
+			backgroundColor = (int) view.getTag();
 		}
 		else
 		{
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
new file mode 100644
index 0000000000..beef06a218
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
@@ -0,0 +1,47 @@
+package org.dolphinemu.dolphinemu.adapters;
+
+
+import android.content.res.Resources;
+import android.support.v17.leanback.widget.ImageCardView;
+import android.support.v17.leanback.widget.Presenter;
+import android.view.ViewGroup;
+
+import org.dolphinemu.dolphinemu.model.TvSettingsItem;
+import org.dolphinemu.dolphinemu.viewholders.TvSettingsViewHolder;
+
+public final class SettingsRowPresenter extends Presenter
+{
+	public Presenter.ViewHolder onCreateViewHolder(ViewGroup parent)
+	{
+		// Create a new view.
+		ImageCardView settingsCard = new ImageCardView(parent.getContext());
+
+		settingsCard.setMainImageAdjustViewBounds(true);
+		settingsCard.setMainImageDimensions(192, 160);
+
+
+		settingsCard.setFocusable(true);
+		settingsCard.setFocusableInTouchMode(true);
+
+		// Use that view to create a ViewHolder.
+		return new TvSettingsViewHolder(settingsCard);
+	}
+
+	public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object item)
+	{
+		TvSettingsViewHolder holder = (TvSettingsViewHolder) viewHolder;
+		TvSettingsItem settingsItem = (TvSettingsItem) item;
+
+		Resources resources = holder.cardParent.getResources();
+
+		holder.itemId = settingsItem.getItemId();
+
+		holder.cardParent.setTitleText(resources.getString(settingsItem.getLabelId()));
+		holder.cardParent.setMainImage(resources.getDrawable(settingsItem.getIconId(), null));
+	}
+
+	public void onUnbindViewHolder(Presenter.ViewHolder viewHolder)
+	{
+		// no op
+	}
+}
\ No newline at end of file
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
new file mode 100644
index 0000000000..ccd87bfa4c
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
@@ -0,0 +1,31 @@
+package org.dolphinemu.dolphinemu.model;
+
+
+public final class TvSettingsItem
+{
+	private final int mItemId;
+	private final int mIconId;
+	private final int mLabelId;
+
+	public TvSettingsItem(int itemId, int iconId, int labelId)
+	{
+		mItemId = itemId;
+		mIconId = iconId;
+		mLabelId = labelId;
+	}
+
+	public int getItemId()
+	{
+		return mItemId;
+	}
+
+	public int getIconId()
+	{
+		return mIconId;
+	}
+
+	public int getLabelId()
+	{
+		return mLabelId;
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
index dd996ccbe7..d27a671c2f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
@@ -4,19 +4,16 @@ import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 /**
  * A simple class that stores references to views so that the GameAdapter doesn't need to
  * keep calling findViewById(), which is expensive.
  */
-public class TvGameViewHolder extends Presenter.ViewHolder
+public final class TvGameViewHolder extends Presenter.ViewHolder
 {
 	public ImageCardView cardParent;
 
 	public ImageView imageScreenshot;
-	public TextView textGameTitle;
-	public TextView textCompany;
 
 	public String gameId;
 
@@ -28,6 +25,8 @@ public class TvGameViewHolder extends Presenter.ViewHolder
 	public String company;
 	public String screenshotPath;
 
+	public int backgroundColor;
+
 	public TvGameViewHolder(View itemView)
 	{
 		super(itemView);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
new file mode 100644
index 0000000000..3264e93f5b
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
@@ -0,0 +1,23 @@
+package org.dolphinemu.dolphinemu.viewholders;
+
+
+import android.support.v17.leanback.widget.ImageCardView;
+import android.support.v17.leanback.widget.Presenter;
+import android.view.View;
+
+public final class TvSettingsViewHolder extends Presenter.ViewHolder
+{
+	public ImageCardView cardParent;
+
+	// Determines what action to take when this item is clicked.
+	public int itemId;
+
+	public TvSettingsViewHolder(View itemView)
+	{
+		super(itemView);
+
+		itemView.setTag(this);
+
+		cardParent = (ImageCardView) itemView;
+	}
+}
diff --git a/Source/Android/app/src/main/res/drawable/ic_add_tv.png b/Source/Android/app/src/main/res/drawable/ic_add_tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..7332c7572767695645983c7c261daef6cb088fb6
GIT binary patch
literal 1708
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

literal 0
HcmV?d00001

diff --git a/Source/Android/app/src/main/res/drawable/ic_refresh_tv.png b/Source/Android/app/src/main/res/drawable/ic_refresh_tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bae5d34ab837c7e7d44a77008f3e956a729bff7
GIT binary patch
literal 1969
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

literal 0
HcmV?d00001

diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e242e7748071f029d35d43492b9619b7c2104fa
GIT binary patch
literal 2248
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
W#h1@&<)CH&0000<MNUMnLSTZ3&<%kA

literal 0
HcmV?d00001


From e7f98c7f959e01cdbf6e09805b9f17719a4efd5f Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Sat, 25 Jul 2015 14:09:58 -0400
Subject: [PATCH 4/4] Android TV: Add first-run copy operations to
 TvMainActivity.

---
 .../dolphinemu/activities/TvMainActivity.java | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
index 1f58698a7e..3f3b8c168d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java
@@ -4,8 +4,10 @@ import android.app.Activity;
 import android.app.ActivityOptions;
 import android.app.FragmentManager;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v17.leanback.app.BrowseFragment;
 import android.support.v17.leanback.database.CursorMapper;
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
@@ -19,6 +21,7 @@ import android.support.v17.leanback.widget.Row;
 import android.support.v17.leanback.widget.RowPresenter;
 import android.widget.Toast;
 
+import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.adapters.GameRowPresenter;
 import org.dolphinemu.dolphinemu.adapters.SettingsRowPresenter;
@@ -26,6 +29,7 @@ import org.dolphinemu.dolphinemu.model.Game;
 import org.dolphinemu.dolphinemu.model.GameDatabase;
 import org.dolphinemu.dolphinemu.model.GameProvider;
 import org.dolphinemu.dolphinemu.model.TvSettingsItem;
+import org.dolphinemu.dolphinemu.services.AssetCopyService;
 import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
 
 public final class TvMainActivity extends Activity
@@ -111,6 +115,23 @@ public final class TvMainActivity extends Activity
 						}
 					}
 				});
+
+		// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
+		if (savedInstanceState == null)
+		{
+			NativeLibrary.SetUserDirectory(""); // Auto-Detect
+
+			SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+			boolean assetsCopied = preferences.getBoolean("assetsCopied", false);
+
+			// Only perform these extensive copy operations once.
+			if (!assetsCopied)
+			{
+				// Copy assets into appropriate locations.
+				Intent copyAssets = new Intent(this, AssetCopyService.class);
+				startService(copyAssets);
+			}
+		}
 	}
 
 	/**