Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc4c4be authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit '60e8ff6d':
  New icon for "Sleep now."
parents c2980b03 60e8ff6d

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

0 → 100644
+6.22 KiB
Loading image diff...

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

0 → 100644
+3.49 KiB
Loading image diff...

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

0 → 100644
+9.15 KiB
Loading image diff...

packages/SystemUI/src/com/android/systemui/Somnambulator.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class Somnambulator extends Activity { 
                    | 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);