From fa0c3aa62d308797311e0380789fd1998bbcbb4a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Dec 2014 20:17:24 -0500 Subject: Android: Remove unnecessary context variable in SliderPreference --- .../org/dolphinemu/dolphinemu/utils/SliderPreference.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Source/Android/src') diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java b/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java index b5b394ed83..a4b67a89a8 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java @@ -5,7 +5,6 @@ import android.content.Context; import android.os.Bundle; import android.preference.DialogPreference; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -19,8 +18,6 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek { private static final String androidns = "http://schemas.android.com/apk/res/android"; - private Context m_context; - // SeekBar private int m_max, m_value; private SeekBar m_seekbar; @@ -30,8 +27,7 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek public SliderPreference(Context context, AttributeSet attrs) { - super(context,attrs); - m_context = context; + super(context, attrs); // Seekbar values m_value = attrs.getAttributeIntValue(androidns, "defaultValue", 0); @@ -41,7 +37,7 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek @Override protected View onCreateDialogView() { - LayoutInflater inflater = LayoutInflater.from(m_context); + LayoutInflater inflater = LayoutInflater.from(getContext()); LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.slider_layout, null, false); m_seekbar = (SeekBar)layout.getChildAt(0); @@ -77,8 +73,8 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek } @Override - public void showDialog(Bundle state) { - + public void showDialog(Bundle state) + { super.showDialog(state); Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE); @@ -86,7 +82,8 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek } @Override - public void onClick(View v) { + public void onClick(View v) + { if (shouldPersist()) { persistString(Integer.toString(m_seekbar.getProgress())); -- cgit v1.2.3 From 038b9686980a6e9373afc71998be5484e39d2218 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Dec 2014 20:33:24 -0500 Subject: Android: Use findViewById instead of getChildAt More futureproof if anything else is added to the layout. --- .../Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Android/src') diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java b/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java index a4b67a89a8..eab6f74ff0 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/utils/SliderPreference.java @@ -40,8 +40,8 @@ public class SliderPreference extends DialogPreference implements SeekBar.OnSeek LayoutInflater inflater = LayoutInflater.from(getContext()); LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.slider_layout, null, false); - m_seekbar = (SeekBar)layout.getChildAt(0); - m_textview = (TextView)layout.getChildAt(1); + m_seekbar = (SeekBar)layout.findViewById(R.id.sliderSeekBar); + m_textview = (TextView)layout.findViewById(R.id.sliderTextView); if (shouldPersist()) m_value = Integer.valueOf(getPersistedString(Integer.toString(m_value))); -- cgit v1.2.3