diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
index 2414f46669..b961104e14 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
@@ -16,7 +16,6 @@ import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog;
import org.dolphinemu.dolphinemu.model.GameFile;
import org.dolphinemu.dolphinemu.services.GameFileCacheManager;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
import org.dolphinemu.dolphinemu.utils.PicassoUtils;
import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
@@ -68,23 +67,8 @@ public final class GameRowPresenter extends Presenter
holder.gameFile = gameFile;
- // Set the platform-dependent background color of the card
- int backgroundId;
- switch (Platform.fromNativeInt(gameFile.getPlatform()))
- {
- case GAMECUBE:
- backgroundId = R.drawable.tv_card_background_gamecube;
- break;
- case WII:
- backgroundId = R.drawable.tv_card_background_wii;
- break;
- case WIIWARE:
- backgroundId = R.drawable.tv_card_background_wiiware;
- break;
- default:
- throw new AssertionError("Not reachable.");
- }
- Drawable background = ContextCompat.getDrawable(context, backgroundId);
+ // Set the background color of the card
+ Drawable background = ContextCompat.getDrawable(context, R.drawable.tv_card_background);
holder.cardParent.setInfoAreaBackground(background);
holder.cardParent.setOnLongClickListener((view) ->
{
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
index 286e36539e..f05cffb983 100644
--- 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
@@ -2,12 +2,16 @@
package org.dolphinemu.dolphinemu.adapters;
+import android.content.Context;
import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
import android.view.ViewGroup;
+import androidx.core.content.ContextCompat;
import androidx.leanback.widget.ImageCardView;
import androidx.leanback.widget.Presenter;
+import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.model.TvSettingsItem;
import org.dolphinemu.dolphinemu.viewholders.TvSettingsViewHolder;
@@ -21,7 +25,6 @@ public final class SettingsRowPresenter extends Presenter
settingsCard.setMainImageAdjustViewBounds(true);
settingsCard.setMainImageDimensions(192, 160);
-
settingsCard.setFocusable(true);
settingsCard.setFocusableInTouchMode(true);
@@ -32,6 +35,7 @@ public final class SettingsRowPresenter extends Presenter
public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object item)
{
TvSettingsViewHolder holder = (TvSettingsViewHolder) viewHolder;
+ Context context = holder.cardParent.getContext();
TvSettingsItem settingsItem = (TvSettingsItem) item;
Resources resources = holder.cardParent.getResources();
@@ -39,7 +43,11 @@ public final class SettingsRowPresenter extends Presenter
holder.itemId = settingsItem.getItemId();
holder.cardParent.setTitleText(resources.getString(settingsItem.getLabelId()));
- holder.cardParent.setMainImage(resources.getDrawable(settingsItem.getIconId(), null));
+ holder.cardParent.setMainImage(resources.getDrawable(settingsItem.getIconId()));
+
+ // Set the background color of the card
+ Drawable background = ContextCompat.getDrawable(context, R.drawable.tv_card_background);
+ holder.cardParent.setInfoAreaBackground(background);
}
public void onUnbindViewHolder(Presenter.ViewHolder viewHolder)
diff --git a/Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml b/Source/Android/app/src/main/res/drawable/tv_card_background.xml
similarity index 100%
rename from Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml
rename to Source/Android/app/src/main/res/drawable/tv_card_background.xml
diff --git a/Source/Android/app/src/main/res/drawable/tv_card_background_wii.xml b/Source/Android/app/src/main/res/drawable/tv_card_background_wii.xml
deleted file mode 100644
index d4a04a9203..0000000000
--- a/Source/Android/app/src/main/res/drawable/tv_card_background_wii.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-