summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2013-10-02 22:31:17 -0400
committerLioncash <mathew1800@gmail.com>2013-10-02 22:31:17 -0400
commit4e08a6cc8db1e360a6d07fedb18e2dbe989dc510 (patch)
tree4d77cf8fce89e56b10520c979f7860f5f3ddf2cc /Source
parentc517b7fe7e8136c410ea79c230c5c98002353391 (diff)
[Android] Simplify a string retrieval in FolderBrowserAdapter.
Also remove an unnecessary import from EmulationActivity.java. This should have been removed in the previous commit.
Diffstat (limited to 'Source')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java1
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
index 74306f278b..95cddc0a30 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
@@ -8,7 +8,6 @@ package org.dolphinemu.dolphinemu.emulation;
import android.app.Activity;
import android.app.AlertDialog;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
index 8efe78b367..b0bf108aa0 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
@@ -78,7 +78,7 @@ public final class FolderBrowserAdapter extends ArrayAdapter<FolderBrowserItem>
if(subtitle != null)
{
// Remove the subtitle for all folders, except for the parent directory folder.
- if (item.isDirectory() && !item.getSubtitle().equals(c.getResources().getString(R.string.parent_directory)))
+ if (item.isDirectory() && !item.getSubtitle().equals(c.getString(R.string.parent_directory)))
{
subtitle.setVisibility(View.GONE);
}