summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorParamananda Pradhan <parama@codeaurora.org>2014-12-14 17:27:31 +0530
committerRicardo Cerqueira <ricardo@cyngn.com>2015-09-15 21:31:49 +0100
commit829f9ad8c06070038cdef24e5fac76a8a16f841b (patch)
tree80fb1a7700307bb833226e04e5547f91f86f374a /res
parenta5aa75d6ac958822e145b61e7c475bd1dc1b5260 (diff)
downloadandroid_packages_apps_Gallery2-829f9ad8c06070038cdef24e5fac76a8a16f841b.tar.gz
android_packages_apps_Gallery2-829f9ad8c06070038cdef24e5fac76a8a16f841b.tar.bz2
android_packages_apps_Gallery2-829f9ad8c06070038cdef24e5fac76a8a16f841b.zip
Gallery2: Make Gallery2 support OMADRM feature
- Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/drm_image.pngbin0 -> 4378 bytes
-rw-r--r--res/drawable-mdpi/drm_image.pngbin0 -> 3982 bytes
-rw-r--r--res/drawable-xhdpi/drm_image.pngbin0 -> 5014 bytes
-rw-r--r--res/menu/operation.xml5
-rw-r--r--res/menu/photo.xml5
-rwxr-xr-xres/values/strings.xml5
6 files changed, 15 insertions, 0 deletions
diff --git a/res/drawable-hdpi/drm_image.png b/res/drawable-hdpi/drm_image.png
new file mode 100644
index 000000000..f51d615ee
--- /dev/null
+++ b/res/drawable-hdpi/drm_image.png
Binary files differ
diff --git a/res/drawable-mdpi/drm_image.png b/res/drawable-mdpi/drm_image.png
new file mode 100644
index 000000000..dbbd7d8f0
--- /dev/null
+++ b/res/drawable-mdpi/drm_image.png
Binary files differ
diff --git a/res/drawable-xhdpi/drm_image.png b/res/drawable-xhdpi/drm_image.png
new file mode 100644
index 000000000..ff2877691
--- /dev/null
+++ b/res/drawable-xhdpi/drm_image.png
Binary files differ
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index b915f39c5..d6f954459 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -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>
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index 91bf0441f..9cc375601 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -78,4 +78,9 @@
<item android:id="@+id/print"
android:title="@string/print_image"
android:showAsAction="never" />
+ <item android:id="@+id/action_drm_info"
+ android:title="@string/drm_license_info"
+ android:enabled="true"
+ android:visible="false"
+ android:showAsAction="never" />
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 167ac893c..b67c6a363 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1127,4 +1127,9 @@ CHAR LIMIT = NONE] -->
<string name="text_makeup_trimface">Trimface</string>
<string name="text_makeup_bigeye">Bigeye</string>
+
+ <string name="no_permission_for_drm">"Sorry, Drm file can not be shared"</string>
+ <string name="drm_license_info">Drm license info</string>
+ <string name="mimetype_not_supported">This file can not be played</string>
+ <string name="action_consumes_rights">Rights will be consumed for playing this media</string>
</resources>