diff options
| author | Alan Newberger <alann@google.com> | 2014-07-17 09:55:34 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2014-07-18 10:28:37 -0700 |
| commit | 39529585aee23703553c551eadceca78742cf52b (patch) | |
| tree | 757cc8ee1f51afb7d432fdadf5e405d45e9db623 /src/com/android/camera/CameraActivity.java | |
| parent | 71ae986c611c49674d53af48e56da629de0ace93 (diff) | |
| download | android_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.tar.gz android_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.tar.bz2 android_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.zip | |
Route switch preferences through SettingManager
This CL adds a custom switch which uses SettingsManager to control
boolean settings. It relocates SettingsManager to the application
to allow access from multiple activities.
Bug: 16327665
Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 9c9bfb09a..80ec9a64c 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1295,7 +1295,7 @@ public class CameraActivity extends Activity GcamHelper.init(getContentResolver()); ModulesInfo.setupModules(mAppContext, mModuleManager); - mSettingsManager = new SettingsManager(this); + mSettingsManager = getServices().getSettingsManager(); Upgrade.executeUpgradeOnVersionChanged(mSettingsManager, Keys.KEY_UPGRADE_VERSION, UpgradeAosp.AOSP_UPGRADE_VERSION, UpgradeAosp.getAospUpgradeSteps(this)); |