From 01f5f347cf33813b51bd0865dc620d001c8d8735 Mon Sep 17 00:00:00 2001
From: Paramananda <parama@codeaurora.org>
Date: Tue, 24 Mar 2015 17:51:29 +0530
Subject: Gallery2 : Uses internal Drm image decoder api in Gallery app

- Remove all previous drm implementation which is basically uses
  base bitmap decode apis to decode drm image files.
- Introduced new hidden apis on BitmapFactory and
  BitmapRegionDecoder specific to DRM content which
  is more practical to DRM framework.
- Uses DrmHelper a utility drm api library to code reusability.
- This approch will fix the issue on sharing images from
  Third party application.

CRs-fixed : 804191

Change-Id: I2e9489800c57df4fdeeb21f1548fbccc6dfbd3f9
---
 res/layout/appwidget_photo_item.xml | 8 ++++++++
 res/values-es-rUS/strings.xml       | 5 +++++
 2 files changed, 13 insertions(+)

(limited to 'res')

diff --git a/res/layout/appwidget_photo_item.xml b/res/layout/appwidget_photo_item.xml
index a56a6d7a5..25e88f5fb 100644
--- a/res/layout/appwidget_photo_item.xml
+++ b/res/layout/appwidget_photo_item.xml
@@ -24,4 +24,12 @@
             android:layout_width="wrap_content"
             android:scaleType="fitCenter"
             android:adjustViewBounds="true" />
+
+    <ImageView
+        android:id="@+id/drm_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/drm_image" />
+
 </FrameLayout>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e639fd4c5..2c4ab5166 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -436,4 +436,9 @@
     <item quantity="one" msgid="6949174783125614798">"%1$d foto"</item>
     <item quantity="other" msgid="3813306834113858135">"%1$d fotos"</item>
   </plurals>
+
+    <string name="no_permission_for_drm">Los archivos DRM no pueden compartirse.</string>
+    <string name="drm_license_info">Información de licencia Drm</string>
+    <string name="mimetype_not_supported">No puede reproducirse este archivo.</string>
+    <string name="action_consumes_rights">Se agotarán los derechos para reproducir este multimedia.</string>
 </resources>
-- 
cgit v1.2.3