From 9510e2ea7f7387ee939b88a1104bedf157523772 Mon Sep 17 00:00:00 2001 From: nebkat Date: Wed, 21 Mar 2012 09:19:26 +0000 Subject: NumberPickerPreference: Cleanup external min/max code Change-Id: I5f67a1e382cd96852836f5a2d5f79affd5f16abe --- .../preference/NumberPickerPreference.java | 30 +++------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java index c7ea4fbd7..8e1058c77 100644 --- a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java +++ b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java @@ -38,7 +38,6 @@ public class NumberPickerPreference extends DialogPreference { private int mMin, mMax, mDefault; private String mMaxExternalKey, mMinExternalKey; - private Preference mMaxExternalPreference, mMinExternalPreference; private NumberPicker mNumberPicker; @@ -61,38 +60,17 @@ public class NumberPickerPreference extends DialogPreference { numberPickerType.recycle(); } - - protected void onAttachedToActivity() { - // External values - if (mMaxExternalKey != null) { - Preference maxPreference = findPreferenceInHierarchy(mMaxExternalKey); - if (maxPreference != null) { - if (maxPreference instanceof NumberPickerPreference) { - mMaxExternalPreference = maxPreference; - } - } - } - if (mMinExternalKey != null) { - Preference minPreference = findPreferenceInHierarchy(mMinExternalKey); - if (minPreference != null) { - if (minPreference instanceof NumberPickerPreference) { - mMinExternalPreference = minPreference; - } - } - } - } - @Override protected View onCreateDialogView() { int max = mMax; int min = mMin; // External values - if (mMaxExternalKey != null && mMaxExternalPreference != null) { - max = mMaxExternalPreference.getSharedPreferences().getInt(mMaxExternalKey, mMax); + if (mMaxExternalKey != null) { + max = getSharedPreferences().getInt(mMaxExternalKey, mMax); } - if (mMinExternalKey != null && mMinExternalPreference != null) { - min = mMinExternalPreference.getSharedPreferences().getInt(mMinExternalKey, mMin); + if (mMinExternalKey != null) { + min = getSharedPreferences().getInt(mMinExternalKey, mMin); } LayoutInflater inflater = -- cgit v1.2.3