diff options
| author | John Spurlock <jspurlock@google.com> | 2012-10-18 16:41:09 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-10-19 11:27:22 -0400 |
| commit | d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9 (patch) | |
| tree | 40ebed270590a98cb73566a615ab73dab6424e84 /src/com/android/settings/DreamBackend.java | |
| parent | 5a740ab1b9d5757d684f6a798932f0b4729cc9a7 (diff) | |
| download | packages_apps_Settings-d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9.zip packages_apps_Settings-d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9.tar.gz packages_apps_Settings-d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9.tar.bz2 | |
Settings: Use new shared dream setting defaults.
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
Diffstat (limited to 'src/com/android/settings/DreamBackend.java')
| -rw-r--r-- | src/com/android/settings/DreamBackend.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java index a866174..70124ef 100644 --- a/src/com/android/settings/DreamBackend.java +++ b/src/com/android/settings/DreamBackend.java @@ -75,12 +75,21 @@ public class DreamBackend { private final Context mContext; private final IDreamManager mDreamManager; private final DreamInfoComparator mComparator; + private final boolean mDreamsEnabledByDefault; + private final boolean mDreamsActivatedOnSleepByDefault; + private final boolean mDreamsActivatedOnDockByDefault; public DreamBackend(Context context) { mContext = context; mDreamManager = IDreamManager.Stub.asInterface( ServiceManager.getService(DreamService.DREAM_SERVICE)); mComparator = new DreamInfoComparator(getDefaultDream()); + mDreamsEnabledByDefault = context.getResources() + .getBoolean(com.android.internal.R.bool.config_dreamsEnabledByDefault); + mDreamsActivatedOnSleepByDefault = context.getResources() + .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault); + mDreamsActivatedOnDockByDefault = context.getResources() + .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault); } public List<DreamInfo> getDreamInfos() { @@ -134,7 +143,7 @@ public class DreamBackend { } public boolean isEnabled() { - return getBoolean(SCREENSAVER_ENABLED); + return getBoolean(SCREENSAVER_ENABLED, mDreamsEnabledByDefault); } public void setEnabled(boolean value) { @@ -143,7 +152,7 @@ public class DreamBackend { } public boolean isActivatedOnDock() { - return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK); + return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK, mDreamsActivatedOnDockByDefault); } public void setActivatedOnDock(boolean value) { @@ -152,7 +161,7 @@ public class DreamBackend { } public boolean isActivatedOnSleep() { - return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP); + return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, mDreamsActivatedOnSleepByDefault); } public void setActivatedOnSleep(boolean value) { @@ -160,8 +169,8 @@ public class DreamBackend { setBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, value); } - private boolean getBoolean(String key) { - return Settings.Secure.getInt(mContext.getContentResolver(), key, 1) == 1; + private boolean getBoolean(String key, boolean def) { + return Settings.Secure.getInt(mContext.getContentResolver(), key, def ? 1 : 0) == 1; } private void setBoolean(String key, boolean value) { |