diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java index b0bf108aa0..8d96a8232c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java @@ -27,7 +27,7 @@ import org.dolphinemu.dolphinemu.R; */ public final class FolderBrowserAdapter extends ArrayAdapter { - private final Context c; + private final Context context; private final int id; private final List items; @@ -42,7 +42,7 @@ public final class FolderBrowserAdapter extends ArrayAdapter { super(context, resourceId, objects); - this.c = context; + this.context = context; this.id = resourceId; this.items = objects; } @@ -59,7 +59,7 @@ public final class FolderBrowserAdapter extends ArrayAdapter View v = convertView; if (v == null) { - LayoutInflater vi = (LayoutInflater) c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater vi = LayoutInflater.from(context); v = vi.inflate(id, parent, false); } @@ -78,7 +78,7 @@ public final class FolderBrowserAdapter extends ArrayAdapter if(subtitle != null) { // Remove the subtitle for all folders, except for the parent directory folder. - if (item.isDirectory() && !item.getSubtitle().equals(c.getString(R.string.parent_directory))) + if (item.isDirectory() && !item.getSubtitle().equals(context.getString(R.string.parent_directory))) { subtitle.setVisibility(View.GONE); } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java index 9ff3d62d34..d0b3642ffe 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java @@ -26,7 +26,7 @@ import org.dolphinemu.dolphinemu.R; */ public final class GameListAdapter extends ArrayAdapter { - private final Context c; + private final Context context; private final int id; private final Listitems; @@ -41,7 +41,7 @@ public final class GameListAdapter extends ArrayAdapter { super(context, resourceId, objects); - this.c = context; + this.context = context; this.id = resourceId; this.items = objects; } @@ -58,7 +58,7 @@ public final class GameListAdapter extends ArrayAdapter View v = convertView; if (v == null) { - LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater vi = LayoutInflater.from(context); v = vi.inflate(id, parent, false); } @@ -78,8 +78,8 @@ public final class GameListAdapter extends ArrayAdapter if (icon != null) { icon.setImageBitmap(item.getImage()); - icon.getLayoutParams().width = (int) ((860 / c.getResources().getDisplayMetrics().density) + 0.5); - icon.getLayoutParams().height = (int)((340 / c.getResources().getDisplayMetrics().density) + 0.5); + icon.getLayoutParams().width = (int) ((860 / context.getResources().getDisplayMetrics().density) + 0.5); + icon.getLayoutParams().height = (int)((340 / context.getResources().getDisplayMetrics().density) + 0.5); } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java index 0e84009071..6ea97e3f66 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java @@ -11,6 +11,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.ListView; import android.widget.TextView; import java.util.List; @@ -24,16 +25,24 @@ import org.dolphinemu.dolphinemu.R; */ public final class SideMenuAdapter extends ArrayAdapter { - private final Context c; + private final Context context; private final int id; private final Listitems; - public SideMenuAdapter(Context context, int textViewResourceId, List objects) + /** + * Constructor + * + * @param context The current {@link Context}. + * @param resourceId The resource ID for a layout file containing a layout to use when instantiating views. + * @param objects The objects to represent in the {@link ListView}. + */ + public SideMenuAdapter(Context context, int resourceId, List objects) { - super(context, textViewResourceId, objects); - c = context; - id = textViewResourceId; - items = objects; + super(context, resourceId, objects); + + this.context = context; + this.id = resourceId; + this.items = objects; } @Override @@ -48,7 +57,7 @@ public final class SideMenuAdapter extends ArrayAdapter View v = convertView; if (v == null) { - LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater vi = LayoutInflater.from(context); v = vi.inflate(id, null); }