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

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

Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev

parents 378d131e 32f6fd55
Loading
Loading
Loading
Loading
+13 −0
Original line number Original line Diff line number Diff line
@@ -193,5 +193,18 @@
                <category android:name="android.intent.category.DREAM" />
                <category android:name="android.intent.category.DREAM" />
            </intent-filter>
            </intent-filter>
        </service>
        </service>

        <activity android:name=".Somnambulator"
            android:label="@string/start_dreams"
            android:icon="@mipmap/ic_dreams"
            android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
            android:exported="true"
            android:excludeFromRecents="true"
            >
            <intent-filter>
                <action android:name="android.intent.action.CREATE_SHORTCUT" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
    </application>
    </application>
</manifest>
</manifest>
+3.49 KiB
Loading image diff...
+2.31 KiB
Loading image diff...
+4.88 KiB
Loading image diff...
+4 −3
Original line number Original line Diff line number Diff line
@@ -372,9 +372,6 @@
    <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
    <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_clear_all">Clear all notifications.</string>
    <string name="accessibility_clear_all">Clear all notifications.</string>


    <!-- Description of the desk dock action that invokes the Android Dreams screen saver feature -->
    <string name="dreams_dock_launcher">Activate screen saver</string>

    <!-- Title shown in notification popup for inspecting the responsible
    <!-- Title shown in notification popup for inspecting the responsible
         application -->
         application -->
    <string name="status_bar_notification_inspect_item_title">App info</string>
    <string name="status_bar_notification_inspect_item_title">App info</string>
@@ -400,4 +397,8 @@


    <!-- Name of the Jelly Bean platlogo screensaver -->
    <!-- Name of the Jelly Bean platlogo screensaver -->
    <string name="jelly_bean_dream_name">BeanFlinger</string>
    <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">Start dreams</string>

</resources>
</resources>
Loading