summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-11-15 02:57:59 -0500
committerLioncash <mathew1800@gmail.com>2014-11-15 02:57:59 -0500
commite47bfc2788f4ff166ee088e92aee0763b0d55647 (patch)
treeb36f461bb60b844604c3be1f6a149197b85ab10b /Source/Android/src
parentd8b673e864d6f337be1d4aa733ff72d2a6307502 (diff)
parent7d8248e24fba1f9294d081c66e91297bbc075d0d (diff)
Merge pull request #1544 from lioncash/android
Android: Misc Changes
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java5
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java9
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java4
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java5
4 files changed, 11 insertions, 12 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
index b66aa0a84f..769595c1b4 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -53,6 +53,11 @@ public final class NativeLibrary
public static final int PRESSED = 1;
}
+ private NativeLibrary()
+ {
+ // Disallows instantiation.
+ }
+
/**
* Default touchscreen device
*/
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
index 97400c23b8..669ffe0094 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
@@ -144,14 +144,7 @@ public final class FolderBrowser extends ListFragment
{
String isoPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
- if (isoPath.equals(currentDir.getPath()))
- {
- pathNotPresent = false;
- }
- else
- {
- pathNotPresent = true;
- }
+ pathNotPresent = !isoPath.equals(currentDir.getPath());
}
// User doesn't have this path in the config, so add it.
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
index 6459eda8d8..6e25a33804 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
@@ -8,12 +8,8 @@ package org.dolphinemu.dolphinemu.gamelist;
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import org.dolphinemu.dolphinemu.NativeLibrary;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 49ae2bfebd..d2ae56b40f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -21,6 +21,11 @@ import android.preference.PreferenceManager;
*/
public final class UserPreferences
{
+ private UserPreferences()
+ {
+ // Disallows instantiation.
+ }
+
/**
* Loads the settings stored in the Dolphin ini config files to the shared preferences of this front-end.
*