Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev

Author: dsandler

packages/SystemUI/AndroidManifest.xml

@@ -214,7 +214,7 @@
 
         <activity android:name=".Somnambulator"
             android:label="@string/start_dreams"
-            android:icon="@mipmap/ic_launcher_dreams"
+            android:icon="@mipmap/ic_daydreams"
             android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
             android:exported="true"
             android:excludeFromRecents="true"

packages/SystemUI/res/mipmap-hdpi/ic_daydreams.png

@@ -456,7 +456,7 @@
     <string name="jelly_bean_dream_name">BeanFlinger</string>
 
     <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
-    <string name="start_dreams">Sleep Now</string>
+    <string name="start_dreams">Daydream</string>
 
     <!-- Textual description of Ethernet connections -->
     <string name="ethernet_label">Ethernet</string>

packages/SystemUI/res/mipmap-mdpi/ic_daydreams.png

@@ -43,7 +43,7 @@ public void onStart() {
                     | Intent.FLAG_ACTIVITY_NEW_TASK);
             Intent resultIntent = new Intent();
             resultIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                    Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_dreams));
+                    Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_daydreams));
             resultIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
             resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams));
             setResult(RESULT_OK, resultIntent);