diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-03-28 14:09:12 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-28 15:35:36 -0700 |
| commit | bbbc9107f02bf48505c1123cbb5bb1810572079c (patch) | |
| tree | 9dc45a0ebbeebabfbceb13a00ac994ebac2736b4 /res | |
| parent | 741973ed5c52011444250d7b6002dd8b86ac7be3 (diff) | |
| download | android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.gz android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.bz2 android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.zip | |
Revert OMADRM feature.staging/cm-12.1
* No need for this.
Revert "Gallery2 : Added support for Oma drm (CD and SD)"
This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397.
Revert "Gallery2: Make Gallery2 support OMADRM feature"
This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1.
Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/drm_image.png | bin | 4378 -> 0 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/drm_image.png | bin | 3982 -> 0 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/drm_image.png | bin | 5014 -> 0 bytes | |||
| -rw-r--r-- | res/menu/operation.xml | 5 | ||||
| -rw-r--r-- | res/menu/photo.xml | 5 | ||||
| -rwxr-xr-x | res/values/strings.xml | 5 |
6 files changed, 0 insertions, 15 deletions
diff --git a/res/drawable-hdpi/drm_image.png b/res/drawable-hdpi/drm_image.png Binary files differdeleted file mode 100644 index f51d615ee..000000000 --- a/res/drawable-hdpi/drm_image.png +++ /dev/null diff --git a/res/drawable-mdpi/drm_image.png b/res/drawable-mdpi/drm_image.png Binary files differdeleted file mode 100644 index dbbd7d8f0..000000000 --- a/res/drawable-mdpi/drm_image.png +++ /dev/null diff --git a/res/drawable-xhdpi/drm_image.png b/res/drawable-xhdpi/drm_image.png Binary files differdeleted file mode 100644 index ff2877691..000000000 --- a/res/drawable-xhdpi/drm_image.png +++ /dev/null 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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d7543d35..167ac893c 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1122,11 +1122,6 @@ CHAR LIMIT = NONE] --> <!-- The tips of trimming video --> <string name="can_not_trim">Only mp4 and 3gp file can be trimmed</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> <string name="text_makeup_whiten">Whiten</string> <string name="text_makeup_Soften">Soften</string> <string name="text_makeup_trimface">Trimface</string> |
