Skip to content

Commit 8c82025

Browse files
John SpurlockAndroid (Google) Code Review
John Spurlock
authored and
Android (Google) Code Review
committed
Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
2 parents 8b946c0 + ed108f3 commit 8c82025

File tree

7 files changed

+56
-35
lines changed

7 files changed

+56
-35
lines changed

‎core/java/android/service/dreams/Sandman.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
public final class Sandman {
3737
private static final String TAG = "Sandman";
3838

39-
private static final int DEFAULT_SCREENSAVER_ENABLED = 1;
40-
private static final int DEFAULT_SCREENSAVER_ACTIVATED_ON_DOCK = 1;
41-
4239
// The component name of a special dock app that merely launches a dream.
4340
// We don't want to launch this app when docked because it causes an unnecessary
4441
// activity transition. We just want to start the dream.
@@ -109,14 +106,18 @@ private static void startDream(Context context, boolean docked) {
109106
}
110107

111108
private static boolean isScreenSaverEnabled(Context context) {
109+
int def = context.getResources().getBoolean(
110+
com.android.internal.R.bool.config_dreamsEnabledByDefault) ? 1 : 0;
112111
return Settings.Secure.getIntForUser(context.getContentResolver(),
113-
Settings.Secure.SCREENSAVER_ENABLED, DEFAULT_SCREENSAVER_ENABLED,
112+
Settings.Secure.SCREENSAVER_ENABLED, def,
114113
UserHandle.USER_CURRENT) != 0;
115114
}
116115

117116
private static boolean isScreenSaverActivatedOnDock(Context context) {
117+
int def = context.getResources().getBoolean(
118+
com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault) ? 1 : 0;
118119
return Settings.Secure.getIntForUser(context.getContentResolver(),
119-
Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
120-
DEFAULT_SCREENSAVER_ACTIVATED_ON_DOCK, UserHandle.USER_CURRENT) != 0;
120+
Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, def,
121+
UserHandle.USER_CURRENT) != 0;
121122
}
122123
}

‎core/res/res/values/config.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,8 +895,16 @@
895895
<!-- Name of the wimax state tracker clas -->
896896
<string name="config_wimaxStateTrackerClassname" translatable="false"></string>
897897

898-
<!-- enable screen saver feature -->
899-
<bool name="config_enableDreams">true</bool>
898+
<!-- Is the dreams feature supported? -->
899+
<bool name="config_dreamsSupported">true</bool>
900+
<!-- If supported, are dreams enabled? (by default) -->
901+
<bool name="config_dreamsEnabledByDefault">true</bool>
902+
<!-- If supported and enabled, are dreams activated when docked? (by default) -->
903+
<bool name="config_dreamsActivatedOnDockByDefault">true</bool>
904+
<!-- If supported and enabled, are dreams activated when asleep and charging? (by default) -->
905+
<bool name="config_dreamsActivatedOnSleepByDefault">false</bool>
906+
<!-- ComponentName of the default dream (Settings.Secure.SCREENSAVER_COMPONENT) -->
907+
<string name="config_dreamsDefaultComponent">com.google.android.deskclock/com.android.deskclock.Screensaver</string>
900908

901909
<!-- Base "touch slop" value used by ViewConfiguration as a
902910
movement threshold where scrolling should begin. -->

‎core/res/res/values/symbols.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,11 @@
16271627
<java-symbol type="style" name="Theme.Dialog.AppError" />
16281628
<java-symbol type="style" name="Theme.Toast" />
16291629
<java-symbol type="xml" name="storage_list" />
1630-
<java-symbol type="bool" name="config_enableDreams" />
1630+
<java-symbol type="bool" name="config_dreamsSupported" />
1631+
<java-symbol type="bool" name="config_dreamsEnabledByDefault" />
1632+
<java-symbol type="bool" name="config_dreamsActivatedOnDockByDefault" />
1633+
<java-symbol type="bool" name="config_dreamsActivatedOnSleepByDefault" />
1634+
<java-symbol type="string" name="config_dreamsDefaultComponent" />
16311635
<java-symbol type="string" name="enable_explore_by_touch_warning_title" />
16321636
<java-symbol type="string" name="enable_explore_by_touch_warning_message" />
16331637

‎packages/SettingsProvider/res/values/defaults.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,6 @@
165165
Value here is the same as WifiStateMachine.DEFAULT_MAX_DHCP_RETRIES -->
166166
<integer name="def_max_dhcp_retries">9</integer>
167167

168-
<!-- Dreams (screen saver) default settings -->
169-
<!-- Whether the feature is enabled when charging (Settings.Secure.SCREENSAVER_ENABLED) -->
170-
<bool name="def_screensaver_enabled">true</bool>
171-
<!-- Whether the feature activates when docked (SCREENSAVER_ACTIVATE_ON_DOCK) -->
172-
<bool name="def_screensaver_activate_on_dock">true</bool>
173-
<!-- Whether the feature activates when docked (SCREENSAVER_ACTIVATE_ON_SLEEP) -->
174-
<bool name="def_screensaver_activate_on_sleep">false</bool>
175-
<!-- ComponentName of the default screen saver (Settings.Secure.SCREENSAVER_COMPONENT) -->
176-
<string name="def_screensaver_component">com.google.android.deskclock/com.android.deskclock.Screensaver</string>
177-
178168
<!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
179169
<bool name="def_user_setup_complete">false</bool>
180170
</resources>

‎packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,15 +1166,15 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int currentVersion) {
11661166
stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)"
11671167
+ " VALUES(?,?);");
11681168
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ENABLED,
1169-
R.bool.def_screensaver_enabled);
1169+
com.android.internal.R.bool.config_dreamsEnabledByDefault);
11701170
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
1171-
R.bool.def_screensaver_activate_on_dock);
1171+
com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
11721172
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP,
1173-
R.bool.def_screensaver_activate_on_sleep);
1174-
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT,
1175-
R.string.def_screensaver_component);
1173+
com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
11761174
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS,
1177-
R.string.def_screensaver_component);
1175+
com.android.internal.R.string.config_dreamsDefaultComponent);
1176+
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT,
1177+
com.android.internal.R.string.config_dreamsDefaultComponent);
11781178

11791179
db.setTransactionSuccessful();
11801180
} finally {
@@ -2027,15 +2027,15 @@ private void loadSecureSettings(SQLiteDatabase db) {
20272027
}
20282028

20292029
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ENABLED,
2030-
R.bool.def_screensaver_enabled);
2030+
com.android.internal.R.bool.config_dreamsEnabledByDefault);
20312031
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
2032-
R.bool.def_screensaver_activate_on_dock);
2032+
com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
20332033
loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP,
2034-
R.bool.def_screensaver_activate_on_sleep);
2034+
com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
20352035
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS,
2036-
R.string.def_screensaver_component);
2036+
com.android.internal.R.string.config_dreamsDefaultComponent);
20372037
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT,
2038-
R.string.def_screensaver_component);
2038+
com.android.internal.R.string.config_dreamsDefaultComponent);
20392039

20402040
loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
20412041
R.bool.def_accessibility_display_magnification_enabled);

‎services/java/com/android/server/SystemServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ public void run() {
737737
}
738738

739739
if (context.getResources().getBoolean(
740-
com.android.internal.R.bool.config_enableDreams)) {
740+
com.android.internal.R.bool.config_dreamsSupported)) {
741741
try {
742742
Slog.i(TAG, "Dreams Service");
743743
// Dreams (interactive idle-time views, a/k/a screen savers)

‎services/java/com/android/server/power/PowerManagerService.java‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,15 @@ public final class PowerManagerService extends IPowerManager.Stub
280280
// True if dreams are supported on this device.
281281
private boolean mDreamsSupportedConfig;
282282

283+
// Default value for dreams enabled
284+
private boolean mDreamsEnabledByDefaultConfig;
285+
286+
// Default value for dreams activate-on-sleep
287+
private boolean mDreamsActivatedOnSleepByDefaultConfig;
288+
289+
// Default value for dreams activate-on-dock
290+
private boolean mDreamsActivatedOnDockByDefaultConfig;
291+
283292
// True if dreams are enabled by the user.
284293
private boolean mDreamsEnabledSetting;
285294

@@ -490,20 +499,29 @@ private void readConfigurationLocked() {
490499
mWakeUpWhenPluggedOrUnpluggedConfig = resources.getBoolean(
491500
com.android.internal.R.bool.config_unplugTurnsOnScreen);
492501
mDreamsSupportedConfig = resources.getBoolean(
493-
com.android.internal.R.bool.config_enableDreams);
502+
com.android.internal.R.bool.config_dreamsSupported);
503+
mDreamsEnabledByDefaultConfig = resources.getBoolean(
504+
com.android.internal.R.bool.config_dreamsEnabledByDefault);
505+
mDreamsActivatedOnSleepByDefaultConfig = resources.getBoolean(
506+
com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
507+
mDreamsActivatedOnDockByDefaultConfig = resources.getBoolean(
508+
com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
494509
}
495510

496511
private void updateSettingsLocked() {
497512
final ContentResolver resolver = mContext.getContentResolver();
498513

499514
mDreamsEnabledSetting = (Settings.Secure.getIntForUser(resolver,
500-
Settings.Secure.SCREENSAVER_ENABLED, 0,
515+
Settings.Secure.SCREENSAVER_ENABLED,
516+
mDreamsEnabledByDefaultConfig ? 1 : 0,
501517
UserHandle.USER_CURRENT) != 0);
502518
mDreamsActivateOnSleepSetting = (Settings.Secure.getIntForUser(resolver,
503-
Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0,
519+
Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP,
520+
mDreamsActivatedOnSleepByDefaultConfig ? 1 : 0,
504521
UserHandle.USER_CURRENT) != 0);
505522
mDreamsActivateOnDockSetting = (Settings.Secure.getIntForUser(resolver,
506-
Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 0,
523+
Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
524+
mDreamsActivatedOnDockByDefaultConfig ? 1 : 0,
507525
UserHandle.USER_CURRENT) != 0);
508526
mScreenOffTimeoutSetting = Settings.System.getIntForUser(resolver,
509527
Settings.System.SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT,

0 commit comments

Comments
 (0)