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

Commit 2e3a3453 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.

parents 94483ac6 23016e74

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
                <data android:mimeType="image/png" />

                <data android:mimeType="image/webp" />

                <data android:mimeType="image/x-ms-bmp" />

                <data android:mimeType="image/x-MS-bmp" />

                <data android:mimeType="image/vnd.wap.wbmp" />

                <data android:mimeType="application/vnd.google.panorama360+jpg" />

            </intent-filter>

res/drawable-hdpi/drm_image.png

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

res/drawable-mdpi/drm_image.png

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

res/drawable-xhdpi/drm_image.png

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

res/menu/operation.xml

+5 −0
Original line number Diff line number Diff line
@@ -70,4 +70,9 @@ 
            android:title="@string/show_on_map"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_drm_info"

            android:title="@string/drm_license_info"

            android:enabled="true"

            android:visible="false"

            android:showAsAction="never" />

</menu>