diff options
Diffstat (limited to 'src/com/android/camera/ListPreference.java')
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index f593b35e5..34040d79b 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; +import com.android.camera.util.CameraUtil; import com.android.camera2.R; /** @@ -49,7 +50,7 @@ public class ListPreference extends CameraPreference { TypedArray a = context.obtainStyledAttributes( attrs, R.styleable.ListPreference, 0, 0); - mKey = Util.checkNotNull( + mKey = CameraUtil.checkNotNull( a.getString(R.styleable.ListPreference_key)); // We allow the defaultValue attribute to be a string or an array of @@ -137,7 +138,7 @@ public class ListPreference extends CameraPreference { public int findIndexOfValue(String value) { for (int i = 0, n = mEntryValues.length; i < n; ++i) { - if (Util.equals(mEntryValues[i], value)) return i; + if (CameraUtil.equals(mEntryValues[i], value)) return i; } return -1; } |