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

Settings: Minimal refactor to support new dreams api.

Browse Source 
Fix breaking changes to the dreams api.  Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.

Bug:7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
This commit is contained in:
John Spurlock
2012-08-22 09:59:44 -04:00
parent 395f5f7007
commit e5a84b2ea1
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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.SCREENSAVER_COMPONENT; import static android.provider.Settings.Secure.SCREENSAVER_COMPONENTS;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
@@ -79,7 +79,9 @@ public class DreamComponentPreference extends Preference {
IDreamManager dm = IDreamManager.Stub.asInterface( IDreamManager dm = IDreamManager.Stub.asInterface(
ServiceManager.getService("dreams")); ServiceManager.getService("dreams"));
try { try {
cn = dm.getDreamComponent(); ComponentName[] dreams = dm.getDreamComponents();
if (dreams != null && dreams.length > 0)
cn = dreams[0];
} catch (RemoteException ex) { } } catch (RemoteException ex) { }
if (cn == null) { if (cn == null) {
@@ -226,7 +228,8 @@ public class DreamComponentPreference extends Preference {
IDreamManager dm = IDreamManager.Stub.asInterface( IDreamManager dm = IDreamManager.Stub.asInterface(
ServiceManager.getService("dreams")); ServiceManager.getService("dreams"));
try { try {
dm.setDreamComponent(cn); ComponentName[] dreams = { cn };
dm.setDreamComponents(dreams);
} catch (RemoteException ex) { } catch (RemoteException ex) {
// too bad, so sad, oh mom, oh dad // too bad, so sad, oh mom, oh dad
} }

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

@@ -18,6 +18,7 @@ package com.android.settings;
import static android.provider.Settings.Secure.SCREENSAVER_ENABLED; import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK; import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
@@ -53,7 +54,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
private static final String KEY_COMPONENT = "screensaver_component"; private static final String KEY_COMPONENT = "screensaver_component";
private static final String KEY_TEST = "test"; private static final String KEY_TEST = "test";
private static final int DEFAULT_SLEEP = 0; private static final int DEFAULT_SLEEP = 1;
private static final int DEFAULT_DOCK = 1; private static final int DEFAULT_DOCK = 1;
private ActivationSetting mActivateOnSleep; private ActivationSetting mActivateOnSleep;
@@ -72,7 +73,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
mTestPref = findPreference(KEY_TEST); mTestPref = findPreference(KEY_TEST);
mActivateOnSleep = new ActivationSetting(getActivity(), mActivateOnSleep = new ActivationSetting(getActivity(),
SCREENSAVER_ENABLED, DEFAULT_SLEEP, SCREENSAVER_ACTIVATE_ON_SLEEP, DEFAULT_SLEEP,
(CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_SLEEP)); (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_SLEEP));
mActivateOnDock = new ActivationSetting(getActivity(), mActivateOnDock = new ActivationSetting(getActivity(),
SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK, SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK,
@@ -81,7 +82,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
public static boolean isScreenSaverActivatedOnSleep(Context context) { public static boolean isScreenSaverActivatedOnSleep(Context context) {
return 0 != Settings.Secure.getInt( return 0 != Settings.Secure.getInt(
context.getContentResolver(), SCREENSAVER_ENABLED, DEFAULT_SLEEP); context.getContentResolver(), SCREENSAVER_ACTIVATE_ON_SLEEP, DEFAULT_SLEEP);
} }
public static boolean isScreenSaverActivatedOnDock(Context context) { public static boolean isScreenSaverActivatedOnDock(Context context) {
@@ -101,6 +102,13 @@ public class DreamSettings extends SettingsPreferenceFragment {
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
mActivateOnSleep.onClick(preference); mActivateOnSleep.onClick(preference);
mActivateOnDock.onClick(preference); mActivateOnDock.onClick(preference);
// FIXME: infer enabled (until the next rev of the dream settings ui)
boolean enabled = mActivateOnSleep.isSelected() || mActivateOnDock.isSelected();
Settings.Secure.putInt(getActivity().getContentResolver(),
SCREENSAVER_ENABLED,
enabled ? 1 : 0);
refreshDependents(); refreshDependents();
return super.onPreferenceTreeClick(preferenceScreen, preference); return super.onPreferenceTreeClick(preferenceScreen, preference);
} }

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

@@ -36,7 +36,10 @@ public class DreamTesterPreference extends Preference {
protected void onClick() { protected void onClick() {
IDreamManager dm = IDreamManager.Stub.asInterface(ServiceManager.getService("dreams")); IDreamManager dm = IDreamManager.Stub.asInterface(ServiceManager.getService("dreams"));
try { try {
ComponentName cn = dm.getDreamComponent(); ComponentName[] dreams = dm.getDreamComponents();
if (dreams == null || dreams.length == 0)
return;
ComponentName cn = dreams[0];
Log.v(TAG, "DreamComponent cn=" + cn); Log.v(TAG, "DreamComponent cn=" + cn);
dm.testDream(cn); dm.testDream(cn);
} catch (RemoteException ex) { } catch (RemoteException ex) {