[Android] Simplify resizeDrawable in OverlayConfigButton.java.

Also add a missing override to onRestart in DolphinEmulator.java.

2 files changed, 8 insertions, 5 deletions

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index ff18d1af69..b28d476e23 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -82,6 +82,8 @@ public final class DolphinEmulator extends Activity
 			UserPreferences.LoadIniToPrefs(this);
 		}
 	}
+
+	@Override
 	protected void onRestart()
 	{
 		super.onRestart();
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
index 380369014d..20f1b2b4bd 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
@@ -42,7 +42,8 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
 	// float buttonY = sPrefs.getFloat(buttonId+"-Y", -1f);
 	//
 	private final String buttonId;
-	private Drawable resizeDrawable(WindowManager wm, Context context, Drawable image, float scale) {
+	private Drawable resizeDrawable(WindowManager wm, Drawable image, float scale)
+	{
 		// Retrieve screen dimensions.
 		DisplayMetrics displayMetrics = new DisplayMetrics();
 		wm.getDefaultDisplay().getMetrics(displayMetrics);
@@ -52,7 +53,8 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
 				(int)(displayMetrics.heightPixels * scale),
 				(int)(displayMetrics.heightPixels * scale),
 				false);
-		return new BitmapDrawable(context.getResources(), bitmapResized);
+
+		return new BitmapDrawable(getResources(), bitmapResized);
 	}
 
 	/**
@@ -73,9 +75,8 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
 		setOnTouchListener(this);
 
 		// Set the button's icon that represents it.
-		setBackground(resizeDrawable(wm, context,
-						context.getResources().getDrawable(drawableId),
-						drawableId == R.drawable.gcpad_joystick_range ? 0.30f : 0.20f));
+		setBackground(resizeDrawable(wm, getResources().getDrawable(drawableId),
+		                drawableId == R.drawable.gcpad_joystick_range ? 0.30f : 0.20f));
 
 		// Get the SharedPreferences instance.
 		sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);