diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-01-22 17:54:17 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-01-22 18:43:26 +0800 |
| commit | a9c2f922763d3f7d19c237f9c5bd46611b5076fd (patch) | |
| tree | 02627acb00a8b58533d6c23e7d3de6ba57ee99a7 /src | |
| parent | 85f7213b44515c06fee68a085065e5d96181465c (diff) | |
| download | LegacyCamera-a9c2f922763d3f7d19c237f9c5bd46611b5076fd.zip LegacyCamera-a9c2f922763d3f7d19c237f9c5bd46611b5076fd.tar.gz LegacyCamera-a9c2f922763d3f7d19c237f9c5bd46611b5076fd.tar.bz2 | |
Fix the bug focus bracket may appear in infinite focus mode.
bug:2247217
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/Camera.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index fb3ede8..8155885 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -289,7 +289,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, // Initialize location sevice. mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); - readPreference(); + mRecordLocation = RecordLocationPreference.get( + mPreferences, getContentResolver()); if (mRecordLocation) startReceivingLocationUpdates(); keepMediaProviderInstance(); @@ -347,7 +348,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, mOrientationListener.enable(); // Start location update if needed. - readPreference(); + mRecordLocation = RecordLocationPreference.get( + mPreferences, getContentResolver()); if (mRecordLocation) startReceivingLocationUpdates(); installIntentFilter(); @@ -1319,14 +1321,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, } } - private void readPreference() { - mRecordLocation = RecordLocationPreference.get( - mPreferences, getContentResolver()); - mFocusMode = mPreferences.getString( - CameraSettings.KEY_FOCUS_MODE, - getString(R.string.pref_camera_focusmode_default)); - } - @Override public void onResume() { super.onResume(); |