summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-11-16 17:13:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-16 17:13:35 -0800
commitf52a4482dd3ca336f84fc6c533ea4a99a72b23dd (patch)
treec13c064abc26a1c4d1304f020e2489df5382fe54 /packages/SystemUI/src/com/android
parent5311917df5fe9804105ff6070346b8fac4b102df (diff)
parentc224f76303b3124c76768761c544410b86b732f8 (diff)
downloadframeworks_base-f52a4482dd3ca336f84fc6c533ea4a99a72b23dd.zip
frameworks_base-f52a4482dd3ca336f84fc6c533ea4a99a72b23dd.tar.gz
frameworks_base-f52a4482dd3ca336f84fc6c533ea4a99a72b23dd.tar.bz2
Merge "Add a default Dreams component." into ics-mr1
Diffstat (limited to 'packages/SystemUI/src/com/android')
-rw-r--r--packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java b/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java
index b8cdd73..def785b 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)