PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use new shared dream setting defaults.

Browse Source 
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
This commit is contained in:
John Spurlock
2012-10-18 16:41:09 -04:00
parent 5a740ab1b9
commit d983e1d1a5
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DisplaySettings.java
View File

@@ -104,7 +104,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER); mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
if (mScreenSaverPreference != null if (mScreenSaverPreference != null
&& getResources().getBoolean( && getResources().getBoolean(
com.android.internal.R.bool.config_enableDreams) == false) { com.android.internal.R.bool.config_dreamsSupported) == false) {
getPreferenceScreen().removePreference(mScreenSaverPreference); getPreferenceScreen().removePreference(mScreenSaverPreference);
} }

19
src/com/android/settings/DreamBackend.java
View File

@@ -75,12 +75,21 @@ public class DreamBackend {
private final Context mContext; private final Context mContext;
private final IDreamManager mDreamManager; private final IDreamManager mDreamManager;
private final DreamInfoComparator mComparator; private final DreamInfoComparator mComparator;
private final boolean mDreamsEnabledByDefault;
private final boolean mDreamsActivatedOnSleepByDefault;
private final boolean mDreamsActivatedOnDockByDefault;
public DreamBackend(Context context) { public DreamBackend(Context context) {
mContext = context; mContext = context;
mDreamManager = IDreamManager.Stub.asInterface( mDreamManager = IDreamManager.Stub.asInterface(
ServiceManager.getService(DreamService.DREAM_SERVICE)); ServiceManager.getService(DreamService.DREAM_SERVICE));
mComparator = new DreamInfoComparator(getDefaultDream()); 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() { public List<DreamInfo> getDreamInfos() {
@@ -134,7 +143,7 @@ public class DreamBackend {
} }
public boolean isEnabled() { public boolean isEnabled() {
return getBoolean(SCREENSAVER_ENABLED); return getBoolean(SCREENSAVER_ENABLED, mDreamsEnabledByDefault);
} }
public void setEnabled(boolean value) { public void setEnabled(boolean value) {
@@ -143,7 +152,7 @@ public class DreamBackend {
} }
public boolean isActivatedOnDock() { public boolean isActivatedOnDock() {
return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK); return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK, mDreamsActivatedOnDockByDefault);
} }
public void setActivatedOnDock(boolean value) { public void setActivatedOnDock(boolean value) {
@@ -152,7 +161,7 @@ public class DreamBackend {
} }
public boolean isActivatedOnSleep() { public boolean isActivatedOnSleep() {
return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP); return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, mDreamsActivatedOnSleepByDefault);
} }
public void setActivatedOnSleep(boolean value) { public void setActivatedOnSleep(boolean value) {
@@ -160,8 +169,8 @@ public class DreamBackend {
setBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, value); setBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, value);
} }
private boolean getBoolean(String key) { private boolean getBoolean(String key, boolean def) {
return Settings.Secure.getInt(mContext.getContentResolver(), key, 1) == 1; return Settings.Secure.getInt(mContext.getContentResolver(), key, def ? 1 : 0) == 1;
} }
private void setBoolean(String key, boolean value) { private void setBoolean(String key, boolean value) {