From 39529585aee23703553c551eadceca78742cf52b Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Thu, 17 Jul 2014 09:55:34 -0700
Subject: 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
---
 src/com/android/camera/CameraActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/camera/CameraActivity.java')

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));
-- 
cgit v1.2.3