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

Commit 365ece1d authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

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

parents 5d6562d3 bd9cafa4

packages/SystemUI/AndroidManifest.xml

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

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

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

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

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

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

packages/SystemUI/res/values/strings.xml

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