diff options
4 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 767cafe01548..25f7d2565c92 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -741,4 +741,7 @@ <string name="config_wimaxServiceClassname"></string> <!-- Name of the wimax state tracker clas --> <string name="config_wimaxStateTrackerClassname"></string> + + <!-- Name of screensaver components to look for if none has been chosen by the user --> + <string name="config_defaultDreamComponent">com.google.android.deskclock/com.android.deskclock.Screensaver</string> </resources> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index eefb9fe69687..aa36b07242c9 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -48,6 +48,7 @@ <!-- handle dock insertion, launch screensaver instead --> <activity android:name=".DreamsDockLauncher" + android:theme="@android:style/Theme.Dialog" android:label="@string/dreams_dock_launcher"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -124,7 +125,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.DREAM" /> +<!-- <category android:name="android.intent.category.DREAM" />--> </intent-filter> </activity> </application> diff --git a/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java b/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java index b8cdd73aa1d9..def785b48f4d 100644 --- a/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java +++ b/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java @@ -18,6 +18,9 @@ public class DreamsDockLauncher extends Activity { try { String component = Settings.Secure.getString( getContentResolver(), Settings.Secure.DREAM_COMPONENT); + if (component == null) { + component = getResources().getString(com.android.internal.R.string.config_defaultDreamComponent); + } if (component != null) { ComponentName cn = ComponentName.unflattenFromString(component); Intent zzz = new Intent(Intent.ACTION_MAIN) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index b4dd07bffcfe..f0d19d14a992 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3420,6 +3420,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { try { String component = Settings.Secure.getString( mContext.getContentResolver(), Settings.Secure.DREAM_COMPONENT); + if (component == null) { + component = mContext.getResources().getString(R.string.config_defaultDreamComponent); + } if (component != null) { ComponentName cn = ComponentName.unflattenFromString(component); Intent intent = new Intent(Intent.ACTION_MAIN) |