am 33a8bd8: Merge "New icon for "Sleep now."" into jb-mr1-dev

* commit '33a8bd8c40ac3c19674043b1cf3e232a3220868f':
  New icon for "Sleep now."

Author: dsandler

packages/SystemUI/AndroidManifest.xml

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

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

@@ -58,7 +58,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_dreams));
+                    Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_dreams));
             resultIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
             resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams));
             setResult(RESULT_OK, resultIntent);