3 files changed, 0 insertions, 19 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index ff2ce33212..3ab83ed25a 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -25,10 +25,6 @@
     <string name="settings">設定</string>
     <string name="gamepad_config">ゲームパッド設定</string>
     <string name="about">について</string>
-    <string name="loading_browser">ファイルブラウザのロード</string>
-    <string name="loading_settings">設定のロード</string>
-    <string name="loading_gamepad">ゲームパッド設定のロード</string>
-    <string name="loading_about">メニューについてのロード</string>
 
     <!-- Game List Fragment -->
     <string name="file_clicked">クリックされたファイル： </string>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 8fc3805134..51a49ace74 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -25,10 +25,6 @@
     <string name="settings">Settings</string>
     <string name="gamepad_config">Gamepad Config</string>
     <string name="about">About</string>
-    <string name="loading_browser">Loading up the browser</string>
-    <string name="loading_settings">Loading up settings</string>
-    <string name="loading_gamepad">Loading up gamepad config</string>
-    <string name="loading_about">Loading about menu</string>
 
     <!-- Game List Fragment -->
     <string name="file_clicked">File clicked: </string>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index b9e86fbbd9..08736b7360 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -3,17 +3,13 @@ package org.dolphinemu.dolphinemu;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
 import android.view.*;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.Toast;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,8 +29,6 @@ public final class GameListActivity extends Activity
 	private SideMenuAdapter mDrawerAdapter;
 	private ListView mDrawerList;
 
-	private static GameListActivity mMe;
-
 	// Called from the game list fragment
 	public void onZeroFiles()
 	{
@@ -46,7 +40,6 @@ public final class GameListActivity extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.gamelist_activity);
-		mMe = this;
 
 		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
 		mDrawerList = (ListView) findViewById(R.id.left_drawer);
@@ -143,7 +136,6 @@ public final class GameListActivity extends Activity
 			
 			case 1:
 			{
-				Toast.makeText(mMe, getString(R.string.loading_browser), Toast.LENGTH_SHORT).show();
 				mCurFragmentNum = 1;
 				mCurFragment = new FolderBrowser();
 				FragmentManager fragmentManager = getFragmentManager();
@@ -153,7 +145,6 @@ public final class GameListActivity extends Activity
 			
 			case 2:
 			{
-				Toast.makeText(mMe, getString(R.string.loading_settings), Toast.LENGTH_SHORT).show();
 				mCurFragmentNum = 2;
 				mCurFragment = new PrefsFragment();
 				FragmentManager fragmentManager = getFragmentManager();
@@ -163,7 +154,6 @@ public final class GameListActivity extends Activity
 			
 			case 3:
 			{
-				Toast.makeText(mMe, getString(R.string.loading_gamepad), Toast.LENGTH_SHORT).show();
 				mCurFragmentNum = 3;
 				mCurFragment = new InputConfigFragment();
 				FragmentManager fragmentManager = getFragmentManager();
@@ -173,7 +163,6 @@ public final class GameListActivity extends Activity
 			
 			case 4:
 			{
-				Toast.makeText(mMe, getString(R.string.about), Toast.LENGTH_SHORT).show();
 				mCurFragmentNum = 4;
 				mCurFragment = new AboutFragment();
 				FragmentManager fragmentManager = getFragmentManager();