diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-06-17 20:32:22 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2010-06-23 14:25:37 +0800 |
| commit | 1ef634d277d550ed55b5b7089dfd56ed71815bd6 (patch) | |
| tree | 18a36787b1049fbc9a73d087237c67126678d59b /src/com/android/camera/ui/HeadUpDisplay.java | |
| parent | ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 (diff) | |
| download | LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.zip LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.tar.gz LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.tar.bz2 | |
Support multiple camera preferences.
Change-Id: I7c8440424c472c9ff61ac22692ce60234d359efe
Diffstat (limited to 'src/com/android/camera/ui/HeadUpDisplay.java')
| -rw-r--r-- | src/com/android/camera/ui/HeadUpDisplay.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/HeadUpDisplay.java b/src/com/android/camera/ui/HeadUpDisplay.java index 03926f2..0db869b 100644 --- a/src/com/android/camera/ui/HeadUpDisplay.java +++ b/src/com/android/camera/ui/HeadUpDisplay.java @@ -28,7 +28,6 @@ import android.graphics.Rect; import android.hardware.Camera.Parameters; import android.os.Handler; import android.os.Message; -import android.preference.PreferenceManager; import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View.MeasureSpec; @@ -36,6 +35,7 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import com.android.camera.CameraSettings; +import com.android.camera.ComboPreferences; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; import com.android.camera.PreferenceGroup; @@ -67,7 +67,7 @@ public class HeadUpDisplay extends GLView { protected IndicatorBar mIndicatorBar; - private SharedPreferences mSharedPrefs; + private ComboPreferences mSharedPrefs; private PreferenceGroup mPreferenceGroup; private PopupWindow mPopupWindow; @@ -180,7 +180,7 @@ public class HeadUpDisplay extends GLView { public void initialize(Context context, PreferenceGroup preferenceGroup) { mPreferenceGroup = preferenceGroup; - mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); + mSharedPrefs = ComboPreferences.get(context); mSharedPrefs.registerOnSharedPreferenceChangeListener( mSharedPreferenceChangeListener); initializeIndicatorBar(context, preferenceGroup); @@ -406,7 +406,7 @@ public class HeadUpDisplay extends GLView { Editor editor = mSharedPrefs.edit(); editor.clear(); editor.commit(); - CameraSettings.upgradePreferences(mSharedPrefs); + CameraSettings.upgradeAllPreferences(mSharedPrefs); CameraSettings.initialCameraPictureSize(context, param); reloadPreferences(); if (mListener != null) { |