From e0e9b43559dbbb8c7864f0a324c74f8b94a549ad Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Sat, 27 Jan 2018 00:37:05 +0100 Subject: [PATCH] Android: Rename main settings buttons to match the desktop version - Video Settings to Graphics Settings - CPU Settings to Config --- .../org/dolphinemu/dolphinemu/ui/main/MainPresenter.java | 2 +- .../org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java | 6 +++--- Source/Android/app/src/main/res/menu/menu_game_grid.xml | 6 +++--- Source/Android/app/src/main/res/values/strings.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index 3d98684729..92e35e5907 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -67,7 +67,7 @@ public final class MainPresenter mView.launchSettingsActivity(MenuTag.CONFIG); return true; - case R.id.menu_settings_video: + case R.id.menu_settings_graphics: mView.launchSettingsActivity(MenuTag.GRAPHICS); return true; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index f74fbbc4dd..27b5ce6711 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -231,11 +231,11 @@ public final class TvMainActivity extends FragmentActivity implements MainView rowItems.add(new TvSettingsItem(R.id.menu_settings_core, R.drawable.ic_settings_core_tv, - R.string.grid_menu_core_settings)); + R.string.grid_menu_config)); - rowItems.add(new TvSettingsItem(R.id.menu_settings_video, + rowItems.add(new TvSettingsItem(R.id.menu_settings_graphics, R.drawable.ic_settings_graphics_tv, - R.string.grid_menu_video_settings)); + R.string.grid_menu_graphics_settings)); rowItems.add(new TvSettingsItem(R.id.menu_settings_gcpad, R.drawable.ic_settings_gcpad, diff --git a/Source/Android/app/src/main/res/menu/menu_game_grid.xml b/Source/Android/app/src/main/res/menu/menu_game_grid.xml index 696c8716fa..60e7309ff3 100644 --- a/Source/Android/app/src/main/res/menu/menu_game_grid.xml +++ b/Source/Android/app/src/main/res/menu/menu_game_grid.xml @@ -4,13 +4,13 @@ diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index c3f97ae4de..f8c535b9b4 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -209,8 +209,8 @@ Other - CPU Settings - Video Settings + Config + Graphics Settings GameCube Input Wii Input Refresh Library