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

Settings changes for Android Dreams (now Screen Candy).

Browse Source 
- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
This commit is contained in:
Daniel Sandler
2011-11-17 10:44:51 -08:00
parent cee089b152
commit 6f0ea441e4
7 changed files with 142 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/values/strings.xml
View File

@@ -1619,19 +1619,24 @@
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] --> <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string> <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options --> <!-- Display settings screen, trigger for screen saver options -->
<string name="dream_settings_title">Android Dreams</string> <string name="screensaver_settings_title">Screen Candy</string>
<!-- Display settings screen, summary for screen saver options --> <!-- Display settings screen, summary for screen saver options, screen saver is turned on -->
<string name="dream_settings_summary">Screen savers and other idle diversions</string> <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
<string name="screensaver_settings_summary_off">Disabled</string>
<!-- Screen saver settings, setting option name to select a module --> <!-- Screen saver settings, setting option name to select a module -->
<string name="dream_component_title">Selected dream</string> <string name="screensaver_component_title">Selected candy</string>
<!-- Screen saver settings, setting option name to change activation timeout --> <!-- Screen saver settings, setting option name to change activation timeout -->
<string name="dream_timeout_title">When to activate</string> <string name="screensaver_timeout_title">When to activate</string>
<!-- Screen saver settings, setting option summary to change activation timeout --> <!-- Screen saver settings, setting option summary to change activation timeout -->
<string name="dream_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string> <string name="screensaver_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>
<!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled --> <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->
<string name="dream_timeout_zero_summary">Never</string> <string name="screensaver_timeout_zero_summary">Never</string>
<!-- Screen saver settings, button allowing the user to test/try the current module --> <!-- Screen saver settings, button allowing the user to test/try the current module -->
<string name="dream_test">Try it!</string> <string name="screensaver_test">Try it!</string>
<!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
the device is docked -->
<string name="screensaver_activate_on_dock_title">Also start when docked</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions --> <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
<string name="automatic_brightness">Automatic brightness</string> <string name="automatic_brightness">Automatic brightness</string>
<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size --> <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->

6
res/xml/display_settings.xml
View File

@@ -40,9 +40,9 @@
android:entries="@array/screen_timeout_entries" android:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" /> android:entryValues="@array/screen_timeout_values" />
<PreferenceScreen <PreferenceScreen
android:title="@string/dream_settings_title" android:key="screensaver"
android:summary="@string/dream_settings_summary" android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.DreamSettings" /> android:fragment="com.android.settings.DreamSettings" />
<ListPreference <ListPreference

24
res/xml/dream_settings.xml
View File

@@ -15,27 +15,25 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/dream_settings_title" android:title="@string/screensaver_settings_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<com.android.settings.DreamComponentPreference <com.android.settings.DreamComponentPreference
android:key="dream_component" android:key="screensaver_component"
android:title="@string/dream_component_title" android:title="@string/screensaver_component_title"
android:persistent="false" android:persistent="false"
/> />
<ListPreference
android:key="dream_timeout"
android:title="@string/dream_timeout_title"
android:summary="@string/dream_timeout_summary"
android:persistent="false"
android:entries="@array/dream_timeout_entries"
android:entryValues="@array/dream_timeout_values" />
<com.android.settings.DreamTesterPreference <com.android.settings.DreamTesterPreference
android:key="dream_test" android:key="test"
android:title="@string/dream_test" android:title="@string/screensaver_test"
android:persistent="false" android:persistent="false"
/> />
<CheckBoxPreference
android:key="activate_on_dock"
android:persistent="false"
android:title="@string/screensaver_activate_on_dock_title"
android:defaultValue="true" />
</PreferenceScreen> </PreferenceScreen>

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

@@ -39,6 +39,8 @@ import android.util.Log;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.Surface; import android.view.Surface;
import com.android.settings.DreamSettings;
import java.util.ArrayList; import java.util.ArrayList;
public class DisplaySettings extends SettingsPreferenceFragment implements public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -52,6 +54,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_ACCELEROMETER = "accelerometer"; private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_FONT_SIZE = "font_size"; private static final String KEY_FONT_SIZE = "font_size";
private static final String KEY_NOTIFICATION_PULSE = "notification_pulse"; private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
private static final String KEY_SCREEN_SAVER = "screensaver";
private CheckBoxPreference mAccelerometer; private CheckBoxPreference mAccelerometer;
private ListPreference mFontSizePref; private ListPreference mFontSizePref;
@@ -60,6 +63,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private final Configuration mCurConfig = new Configuration(); private final Configuration mCurConfig = new Configuration();
private ListPreference mScreenTimeoutPreference; private ListPreference mScreenTimeoutPreference;
private Preference mScreenSaverPreference;
private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) { private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
@Override @Override
@@ -78,6 +82,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER); mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false); mAccelerometer.setPersistent(false);
mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT); mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT, final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
FALLBACK_SCREEN_TIMEOUT_VALUE); FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -213,6 +219,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private void updateState() { private void updateState() {
updateAccelerometerRotationCheckbox(); updateAccelerometerRotationCheckbox();
readFontSizePreference(mFontSizePref); readFontSizePreference(mFontSizePref);
updateScreenSaverSummary();
}
private void updateScreenSaverSummary() {
mScreenSaverPreference.setSummary(
DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
? R.string.screensaver_settings_summary_on
: R.string.screensaver_settings_summary_off);
} }
private void updateAccelerometerRotationCheckbox() { private void updateAccelerometerRotationCheckbox() {

6
src/com/android/settings/DreamComponentPreference.java
View File

@@ -16,7 +16,7 @@
package com.android.settings; package com.android.settings;
import static android.provider.Settings.Secure.DREAM_COMPONENT; import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
@@ -65,7 +65,7 @@ public class DreamComponentPreference extends Preference {
} }
private void refreshFromSettings() { private void refreshFromSettings() {
String component = Settings.Secure.getString(resolver, DREAM_COMPONENT); String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
if (component == null) { if (component == null) {
component = getContext().getResources().getString( component = getContext().getResources().getString(
com.android.internal.R.string.config_defaultDreamComponent); com.android.internal.R.string.config_defaultDreamComponent);
@@ -168,7 +168,7 @@ public class DreamComponentPreference extends Preference {
setSummary(ri.loadLabel(pm)); setSummary(ri.loadLabel(pm));
//getContext().startActivity(intent); //getContext().startActivity(intent);
Settings.Secure.putString(resolver, DREAM_COMPONENT, cn.flattenToString()); Settings.Secure.putString(resolver, SCREENSAVER_COMPONENT, cn.flattenToString());
} }
}) })
.create(); .create();

154
src/com/android/settings/DreamSettings.java
View File

@@ -16,8 +16,11 @@
package com.android.settings; package com.android.settings;
import static android.provider.Settings.Secure.DREAM_TIMEOUT; import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
import android.app.ActionBar;
import android.app.Activity;
import android.app.ActivityManagerNative; import android.app.ActivityManagerNative;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -31,98 +34,125 @@ import android.os.ServiceManager;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
import android.view.Gravity;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.widget.CompoundButton;
import android.widget.Switch;
import java.util.ArrayList; import java.util.ArrayList;
public class DreamSettings extends SettingsPreferenceFragment implements public class DreamSettings extends SettingsPreferenceFragment {
Preference.OnPreferenceChangeListener {
private static final String TAG = "DreamSettings"; private static final String TAG = "DreamSettings";
private static final String KEY_DREAM_TIMEOUT = "dream_timeout"; private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
private ListPreference mScreenTimeoutPreference; private CheckBoxPreference mActivateOnDockPreference;
private ListPreference mDreamTimeoutPreference;
private Switch mEnableSwitch;
private Enabler mEnabler;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onActivityCreated(savedInstanceState);
ContentResolver resolver = getActivity().getContentResolver();
addPreferencesFromResource(R.xml.dream_settings); addPreferencesFromResource(R.xml.dream_settings);
mDreamTimeoutPreference = (ListPreference) findPreference(KEY_DREAM_TIMEOUT); mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
final long currentSaverTimeout = Settings.Secure.getLong(resolver, DREAM_TIMEOUT,
0); final Activity activity = getActivity();
mDreamTimeoutPreference.setValue(String.valueOf(currentSaverTimeout));
mDreamTimeoutPreference.setOnPreferenceChangeListener(this); mEnableSwitch = new Switch(activity);
updateTimeoutPreferenceDescription(resolver, mDreamTimeoutPreference,
R.string.dream_timeout_summary, if (activity instanceof PreferenceActivity) {
R.string.dream_timeout_zero_summary, PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
currentSaverTimeout); if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mEnableSwitch.setPadding(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.RIGHT));
activity.getActionBar().setTitle(R.string.screensaver_settings_title);
}
}
mEnabler = new Enabler(activity, mEnableSwitch);
} }
private void updateTimeoutPreferenceDescription( public static boolean isScreenSaverEnabled(Context context) {
ContentResolver resolver, return 0 != Settings.Secure.getInt(
ListPreference pref, context.getContentResolver(), SCREENSAVER_ENABLED, 1);
int summaryStrings,
long currentTimeout) {
updateTimeoutPreferenceDescription(resolver, pref, summaryStrings, 0, currentTimeout);
} }
private void updateTimeoutPreferenceDescription(
ContentResolver resolver, public static void setScreenSaverEnabled(Context context, boolean enabled) {
ListPreference pref, Settings.Secure.putInt(
int summaryStrings, context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0);
int zeroString, }
long currentTimeout) {
String summary; public static class Enabler implements CompoundButton.OnCheckedChangeListener {
if (currentTimeout == 0) { private final Context mContext;
summary = pref.getContext().getString(zeroString); private Switch mSwitch;
} else {
final CharSequence[] entries = pref.getEntries(); public Enabler(Context context, Switch switch_) {
final CharSequence[] values = pref.getEntryValues(); mContext = context;
int best = 0; setSwitch(switch_);
for (int i = 0; i < values.length; i++) { }
long timeout = Long.valueOf(values[i].toString()); @Override
if (currentTimeout >= timeout) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
best = i; setScreenSaverEnabled(mContext, isChecked);
} }
} public void setSwitch(Switch switch_) {
summary = pref.getContext().getString(summaryStrings, entries[best]); if (mSwitch == switch_) return;
if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null);
mSwitch = switch_;
mSwitch.setOnCheckedChangeListener(this);
final boolean enabled = isScreenSaverEnabled(mContext);
mSwitch.setChecked(enabled);
}
public void pause() {
mSwitch.setOnCheckedChangeListener(null);
}
public void resume() {
mSwitch.setOnCheckedChangeListener(this);
} }
pref.setSummary(summary);
} }
@Override @Override
public void onResume() { public void onResume() {
if (mEnabler != null) {
mEnabler.resume();
}
final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
SCREENSAVER_ACTIVATE_ON_DOCK, 1);
mActivateOnDockPreference.setChecked(currentActivateOnDock);
super.onResume(); super.onResume();
} }
@Override @Override
public void onPause() { public void onPause() {
if (mEnabler != null) {
mEnabler.pause();
}
super.onPause(); super.onPause();
} }
public boolean onPreferenceChange(Preference preference, Object objValue) { @Override
final String key = preference.getKey(); public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (KEY_DREAM_TIMEOUT.equals(key)) { if (preference == mActivateOnDockPreference) {
int value = Integer.parseInt((String) objValue); Settings.Secure.putInt(getContentResolver(),
try { SCREENSAVER_ACTIVATE_ON_DOCK,
Settings.Secure.putInt(getContentResolver(), mActivateOnDockPreference.isChecked() ? 1 : 0);
DREAM_TIMEOUT, value);
updateTimeoutPreferenceDescription(getContentResolver(),
mDreamTimeoutPreference,
R.string.dream_timeout_summary,
R.string.dream_timeout_zero_summary,
value);
} catch (NumberFormatException e) {
Log.e(TAG, "could not persist dream timeout setting", e);
}
} }
return super.onPreferenceTreeClick(preferenceScreen, preference);
return true;
} }
} }

10
src/com/android/settings/DreamTesterPreference.java
View File

@@ -16,7 +16,7 @@
package com.android.settings; package com.android.settings;
import static android.provider.Settings.Secure.DREAM_COMPONENT; import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
@@ -60,13 +60,15 @@ public class DreamTesterPreference extends Preference {
@Override @Override
protected void onClick() { protected void onClick() {
String component = Settings.Secure.getString(resolver, DREAM_COMPONENT); String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
Log.v(TAG, "component=" + component);
if (component != null) { if (component != null) {
ComponentName cn = ComponentName.unflattenFromString(component); ComponentName cn = ComponentName.unflattenFromString(component);
Log.v(TAG, "cn=" + cn);
Intent intent = new Intent(Intent.ACTION_MAIN) Intent intent = new Intent(Intent.ACTION_MAIN)
.setComponent(cn) .setComponent(cn)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK .addFlags(
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
) )
.putExtra("android.dreams.TEST", true); .putExtra("android.dreams.TEST", true);
getContext().startActivity(intent); getContext().startActivity(intent);