diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-05-10 11:38:21 -0700 |
---|---|---|
committer | Byunghun Jeon <bjeon@codeaurora.org> | 2016-05-31 13:18:21 -0700 |
commit | 0fdbb4a33a2deb480f877b904203c7f04ef507d0 (patch) | |
tree | 42223718b561d86603ef46118c771c617fdba245 /src/com/android/camera/PhotoModule.java | |
parent | e8d4ba774d224e5076576ba4c29d1fc248456b40 (diff) | |
download | android_packages_apps_Snap-0fdbb4a33a2deb480f877b904203c7f04ef507d0.tar.gz android_packages_apps_Snap-0fdbb4a33a2deb480f877b904203c7f04ef507d0.tar.bz2 android_packages_apps_Snap-0fdbb4a33a2deb480f877b904203c7f04ef507d0.zip |
SnapdragonCamera: Add SettingsManager, scene, and filter
Add SettingsManager to work as a database for settings.
It will handle all dependencies and populate the values.
Add scene mode and filter.
Restructure UI and menu by combining them and leave the
handling of settings to SettingsManager
Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88
CRs-Fixed: 1018118
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 7324484ae..5d577a1eb 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -881,8 +881,7 @@ public class PhotoModule } // Initialize location service. - boolean recordLocation = RecordLocationPreference.get( - mPreferences, mContentResolver); + boolean recordLocation = RecordLocationPreference.get(mPreferences); mLocationManager.recordLocation(recordLocation); mUI.initializeFirstTime(); @@ -913,8 +912,7 @@ public class PhotoModule // onResume. private void initializeSecondTime() { // Start location update if needed. - boolean recordLocation = RecordLocationPreference.get( - mPreferences, mContentResolver); + boolean recordLocation = RecordLocationPreference.get(mPreferences); mLocationManager.recordLocation(recordLocation); MediaSaveService s = mActivity.getMediaSaveService(); if (s != null) { @@ -4546,8 +4544,7 @@ public class PhotoModule // ignore the events after "onPause()" if (mPaused) return; - boolean recordLocation = RecordLocationPreference.get( - mPreferences, mContentResolver); + boolean recordLocation = RecordLocationPreference.get(mPreferences); mLocationManager.recordLocation(recordLocation); if(needRestart()){ Log.v(TAG, "Restarting Preview... Camera Mode Changed"); |