Settings changes for Android Dreams (now Screen Candy).

- 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

View File

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