From 0455309dcd9af6dfdef5c72b6939ecceef935fe9 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 17 Oct 2015 23:43:31 -0700
Subject: Gallery2: Revert DRM feature

 * Missing framework support in M, revisit later.

Revert "Gallery2 : Drm file can be set as wallpaper"

This reverts commit b00985f4de70444fa5ece9e8a78a79e73f4475b1.

Revert "Gallery2 : Drm lock icon added on Photo widget for drm content"

This reverts commit 4f3e49619d3954056f899660cc764f3773d92141.

Revert "Gallery2 : GIF animated drm file can be visible in Gallery app"

This reverts commit f5b491b181839286f58d640ae690f1860ef19e8c.

Revert "Gallery2 : Delete and Details options are not visible on Camera preview"

This reverts commit 704bff736bda2bc5f6c5aa2956879f55101191f5.

Revert "Gallery2 : Video share option is not working"

This reverts commit ea87a93df185b9f8c1e477188b55a2fe97dc983e.

Revert "Gallery2 : Uses internal Drm image decoder api in Gallery app"

This reverts commit 01f5f347cf33813b51bd0865dc620d001c8d8735.

Revert "Gallery2 : Added support for Oma drm (CD and SD)"

This reverts commit 43044da1965c1b687695f3f4e1d44d3636496978.

Revert "Gallery2: Make Gallery2 support OMADRM feature"

This reverts commit 829f9ad8c06070038cdef24e5fac76a8a16f841b.

Change-Id: I4300285fd8539eb2e3134a0e472a087b83a0228f
---
 res/drawable-hdpi/drm_image.png         | Bin 4378 -> 0 bytes
 res/drawable-mdpi/drm_image.png         | Bin 3982 -> 0 bytes
 res/drawable-xhdpi/drm_image.png        | Bin 5014 -> 0 bytes
 res/layout/appwidget_drm_empty_item.xml |  48 --------------------------------
 res/layout/appwidget_photo_item.xml     |   8 ------
 res/menu/operation.xml                  |   5 ----
 res/menu/photo.xml                      |   5 ----
 7 files changed, 66 deletions(-)
 delete mode 100644 res/drawable-hdpi/drm_image.png
 delete mode 100644 res/drawable-mdpi/drm_image.png
 delete mode 100644 res/drawable-xhdpi/drm_image.png
 delete mode 100644 res/layout/appwidget_drm_empty_item.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/drm_image.png b/res/drawable-hdpi/drm_image.png
deleted file mode 100644
index f51d615ee..000000000
Binary files a/res/drawable-hdpi/drm_image.png and /dev/null differ
diff --git a/res/drawable-mdpi/drm_image.png b/res/drawable-mdpi/drm_image.png
deleted file mode 100644
index dbbd7d8f0..000000000
Binary files a/res/drawable-mdpi/drm_image.png and /dev/null differ
diff --git a/res/drawable-xhdpi/drm_image.png b/res/drawable-xhdpi/drm_image.png
deleted file mode 100644
index ff2877691..000000000
Binary files a/res/drawable-xhdpi/drm_image.png and /dev/null differ
diff --git a/res/layout/appwidget_drm_empty_item.xml b/res/layout/appwidget_drm_empty_item.xml
deleted file mode 100644
index 8261dbe77..000000000
--- a/res/layout/appwidget_drm_empty_item.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/appwidget_photo_border" >
-
-    <RelativeLayout
-        android:layout_width="@dimen/stack_photo_width"
-        android:layout_height="@dimen/stack_photo_height"
-        android:background="@android:color/darker_gray" >
-
-        <ImageView
-            android:id="@+id/drm_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/drm_image" />
-    </RelativeLayout>
-s
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/appwidget_photo_item.xml b/res/layout/appwidget_photo_item.xml
index 25e88f5fb..a56a6d7a5 100644
--- a/res/layout/appwidget_photo_item.xml
+++ b/res/layout/appwidget_photo_item.xml
@@ -24,12 +24,4 @@
             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/menu/operation.xml b/res/menu/operation.xml
index d6f954459..b915f39c5 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -70,9 +70,4 @@
             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 9cc375601..91bf0441f 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -78,9 +78,4 @@
     <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>
-- 
cgit v1.2.3