Android: Clean up some hardcoded strings

These would lead to problems if we ever add translation support.

7 files changed, 20 insertions, 15 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
index a6c0148032..bad0bc28da 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
@@ -90,7 +90,8 @@ public final class GameDetailsDialog extends DialogFragment
       long blockSize = gameFile.getBlockSize();
       String compression = gameFile.getCompressionMethod();
 
-      textFileFormat.setText(String.format("%1$s (%2$s)", gameFile.getFileFormatName(), fileSize));
+      textFileFormat.setText(getResources().getString(R.string.game_details_size_and_format,
+              gameFile.getFileFormatName(), fileSize));
 
       if (compression.isEmpty())
       {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
index 8ef63c3d6a..91f6076d6a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
@@ -96,7 +96,7 @@ public class GamePropertiesDialog extends DialogFragment
             R.style.DolphinDialogBase);
     itemsBuilder.applyToBuilder(builder);
     builder.setTitle(requireContext()
-            .getString(R.string.preferences_game_properties) + ": " + gameId);
+            .getString(R.string.preferences_game_properties_with_game_id, gameId));
     return builder.create();
   }
 
@@ -113,18 +113,20 @@ public class GamePropertiesDialog extends DialogFragment
     {
       if (gameSettingsFile.delete() || hadGameProfiles)
       {
-        Toast.makeText(getContext(), "Cleared settings for " + gameId, Toast.LENGTH_SHORT)
-                .show();
+        Toast.makeText(getContext(),
+                getResources().getString(R.string.properties_clear_success, gameId),
+                Toast.LENGTH_SHORT).show();
       }
       else
       {
-        Toast.makeText(getContext(), "Unable to clear settings for " + gameId,
+        Toast.makeText(getContext(),
+                getResources().getString(R.string.properties_clear_failure, gameId),
                 Toast.LENGTH_SHORT).show();
       }
     }
     else
     {
-      Toast.makeText(getContext(), "No game settings to delete", Toast.LENGTH_SHORT).show();
+      Toast.makeText(getContext(), R.string.properties_clear_missing, Toast.LENGTH_SHORT).show();
     }
   }
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
index aac533562d..b2a8e89389 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.widget.Toast;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView;
 import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 import org.dolphinemu.dolphinemu.services.GameFileCacheService;
@@ -207,7 +208,7 @@ public class Settings implements Closeable
     if (!isGameSpecific())
     {
       if (context != null)
-        Toast.makeText(context, "Saved settings to INI files", Toast.LENGTH_SHORT).show();
+        Toast.makeText(context, R.string.settings_saved, Toast.LENGTH_SHORT).show();
 
       for (Map.Entry<String, IniFile> entry : mIniFiles.entrySet())
       {
@@ -238,7 +239,10 @@ public class Settings implements Closeable
       // custom game settings
 
       if (context != null)
-        Toast.makeText(context, "Saved settings for " + mGameId, Toast.LENGTH_SHORT).show();
+      {
+        Toast.makeText(context, context.getString(R.string.settings_saved_game_specific, mGameId),
+                Toast.LENGTH_SHORT).show();
+      }
 
       SettingsFile.saveCustomGameSettings(mGameId, getGameSpecificFile());
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
index 12b842c009..066f0322c3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
@@ -170,7 +170,7 @@ public final class SettingsActivityPresenter
         break;
 
       case 2:
-        mView.showToastMessage("Please make sure Continuous Scanning is enabled in Core Settings.");
+        mView.showToastMessage(mContext.getString(R.string.make_sure_continuous_scan_enabled));
         break;
     }
   }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
index f0d6ffe2ea..f09a172c88 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
@@ -35,7 +35,7 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
 
   static
   {
-    titles.put(MenuTag.SETTINGS, R.string.preferences_settings);
+    titles.put(MenuTag.SETTINGS, R.string.settings);
     titles.put(MenuTag.CONFIG, R.string.config);
     titles.put(MenuTag.CONFIG_GENERAL, R.string.general_submenu);
     titles.put(MenuTag.CONFIG_INTERFACE, R.string.interface_submenu);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index 75c0faaa09..af16420b7f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -121,7 +121,7 @@ public final class SettingsFragmentPresenter
   {
     if (!TextUtils.isEmpty(mGameID))
     {
-      mView.getActivity().setTitle("Game Settings: " + mGameID);
+      mView.getActivity().setTitle(mContext.getString(R.string.game_settings, mGameID));
     }
     ArrayList<SettingsItem> sl = new ArrayList<>();
 
@@ -217,8 +217,7 @@ public final class SettingsFragmentPresenter
         break;
 
       default:
-        mView.showToastMessage("Unimplemented menu");
-        return;
+        throw new UnsupportedOperationException("Unimplemented menu");
     }
 
     mSettingsList = sl;
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 d35f440c0c..e7b522a10d 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
@@ -388,8 +388,7 @@ public final class TvMainActivity extends FragmentActivity
             R.string.grid_menu_import_nand_backup));
 
     // Create a header for this row.
-    HeaderItem header =
-            new HeaderItem(R.string.preferences_settings, getString(R.string.preferences_settings));
+    HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings));
 
     return new ListRow(header, rowItems);
   }