summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-am/filtershow_strings.xml2
-rw-r--r--res/values-hi/filtershow_strings.xml12
-rw-r--r--res/values-km-rKH/filtershow_strings.xml2
-rw-r--r--res/values-kn-rIN/filtershow_strings.xml2
-rw-r--r--res/values-ml-rIN/filtershow_strings.xml4
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java10
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java7
-rw-r--r--src/com/android/gallery3d/app/GalleryActivity.java14
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java17
-rw-r--r--src/com/android/gallery3d/app/MovieControllerOverlay.java4
-rwxr-xr-xsrc/com/android/gallery3d/app/MoviePlayer.java12
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java10
-rw-r--r--src/com/android/gallery3d/data/ImageCacheRequest.java9
-rw-r--r--src/com/android/gallery3d/data/LocalImage.java4
-rw-r--r--src/com/android/gallery3d/data/LocalVideo.java4
-rw-r--r--src/com/android/gallery3d/data/UriImage.java4
16 files changed, 63 insertions, 54 deletions
diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml
index 2334d0fea..196e99cc7 100644
--- a/res/values-am/filtershow_strings.xml
+++ b/res/values-am/filtershow_strings.xml
@@ -73,7 +73,7 @@
<string name="wbalance" msgid="6346581563387083613">"ራስ-ቀለም መሙላት"</string>
<string name="hue" msgid="6231252147971086030">"የቀለም ድባብ"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"ጥላዎች"</string>
- <string name="highlight_recovery" msgid="8262208470735204243">"ዋና ዋና ዜናዎች"</string>
+ <string name="highlight_recovery" msgid="8262208470735204243">"ድምቀቶች"</string>
<string name="curvesRGB" msgid="915010781090477550">"ጥምዞች"</string>
<string name="vignette" msgid="934721068851885390">"ቪኜት"</string>
<string name="vignette_main" msgid="6046495605390665423">"ቪኜት"</string>
diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml
index 8ee3a9011..07b794bc3 100644
--- a/res/values-hi/filtershow_strings.xml
+++ b/res/values-hi/filtershow_strings.xml
@@ -26,7 +26,7 @@
<string name="original" msgid="3524493791230430897">"मूल"</string>
<string name="borders" msgid="2067345080568684614">"बॉर्डर"</string>
<string name="custom_border" msgid="8679893731790931871">"कस्टम"</string>
- <string name="filtershow_undo" msgid="6781743189243585101">"वापस लाएं"</string>
+ <string name="filtershow_undo" msgid="6781743189243585101">"पूर्ववत करें"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"फिर से करें"</string>
<string name="show_imagestate_panel" msgid="281932769701043015">"लागू प्रभाव दिखाएं"</string>
<string name="hide_imagestate_panel" msgid="7207643485811695257">"लागू प्रभाव छिपाएं"</string>
@@ -40,7 +40,7 @@
<string name="menu_settings" msgid="6428291655769260831">"सेटिंग"</string>
<string name="unsaved" msgid="8704442449002374375">"इस चित्र में न सहेजे गए बदलाव हैं."</string>
<string name="save_before_exit" msgid="2680660633675916712">"क्या आप बाहर निकलने के पहले सहेजना चाहते हैं?"</string>
- <string name="save_and_exit" msgid="3628425023766687419">"जोड़ें और बाहर निकलें"</string>
+ <string name="save_and_exit" msgid="3628425023766687419">"सहेजें और बाहर निकलें"</string>
<string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिज़ॉल्यूशन चित्र प्रोसेस हो रहा है..."</string>
<string name="exit" msgid="242642957038770113">"बाहर निकलें"</string>
<string name="history" msgid="455767361472692409">"इतिहास"</string>
@@ -93,7 +93,7 @@
<string name="kmeans" msgid="2080952022674981541">"पोस्टराइज़ करें"</string>
<string name="downsample" msgid="3552938534146980104">"डाउनसेंपल"</string>
<string name="grad" msgid="546774853424848655">"ग्रेजुएटेड"</string>
- <string name="editor_grad_brightness" msgid="5937316734380235741">"स्क्रीन की रोशनी"</string>
+ <string name="editor_grad_brightness" msgid="5937316734380235741">"चमक"</string>
<string name="editor_grad_contrast" msgid="3454456673401803360">"कंट्रास्ट"</string>
<string name="editor_grad_saturation" msgid="3760247354109521726">"संतृप्तता"</string>
<string name="editor_chan_sat_main" msgid="4427652337797121940">"मुख्‍य"</string>
@@ -113,7 +113,7 @@
<string name="draw_size" msgid="4360005386104151209">"आकार"</string>
<string name="draw_hue" msgid="4975135843189267133">"रंग"</string>
<string name="draw_saturation" msgid="5394395648014454882">"संतृप्तता"</string>
- <string name="draw_value" msgid="6571604055161538273">"स्क्रीन की रोशनी"</string>
+ <string name="draw_value" msgid="6571604055161538273">"चमक"</string>
<string name="draw_color" msgid="2119030386987211193">"रंग"</string>
<string name="draw_style_line" msgid="9216476853904429628">"रेखाएं"</string>
<string name="draw_style_brush_spatter" msgid="7612691122932981554">"मार्कर"</string>
@@ -131,7 +131,7 @@
<string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सहेजा जा रहा है"</string>
<string name="filtershow_notification_message" msgid="2661871765484036286">"प्रोसस हो रहा है..."</string>
- <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट जोड़ें"</string>
+ <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट सहेजें"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"उपयोगकर्ता प्रीसेट प्रबंधित करें"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"नया प्रीसेट"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"नाम प्रीसेट करें"</string>
@@ -141,7 +141,7 @@
<string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
<string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
<string name="filtershow_add_button_looks" msgid="8630823661416925426">"प्रीसेट"</string>
- <string name="filtershow_add_button_versions" msgid="7620107266685809612">"वर्शन"</string>
+ <string name="filtershow_add_button_versions" msgid="7620107266685809612">"संस्करण"</string>
<string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string>
<string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string>
<string name="filtershow_exif_model" msgid="3543206476046267466">"मॉडल"</string>
diff --git a/res/values-km-rKH/filtershow_strings.xml b/res/values-km-rKH/filtershow_strings.xml
index e613c8d10..4150e7567 100644
--- a/res/values-km-rKH/filtershow_strings.xml
+++ b/res/values-km-rKH/filtershow_strings.xml
@@ -41,7 +41,7 @@
<string name="unsaved" msgid="8704442449002374375">"មាន​ការ​ផ្លាស់ប្ដូរ​​​មិន​បាន​រក្សាទុក​លើ​​រូបភាព​នេះ​។"</string>
<string name="save_before_exit" msgid="2680660633675916712">"តើ​អ្នក​ចង់​រក្សា​ទុក​មុន​ពេល​ចេញ?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"រក្សា​ទុក​​ ហើយ​ចេញ"</string>
- <string name="save_and_processing" msgid="6371565035837463194">"កំពុង​ដំណើរការ​រូបភាព​មាន​គុណភាព​បង្ហាញ​​ពេញលេញ..."</string>
+ <string name="save_and_processing" msgid="6371565035837463194">"កំពុង​ដំណើរការ​គុណភាព​បង្ហាញ​រូបភាព​ពេញលេញ..."</string>
<string name="exit" msgid="242642957038770113">"ចេញ"</string>
<string name="history" msgid="455767361472692409">"ប្រវត្តិ"</string>
<string name="reset" msgid="9013181350779592937">"កំណត់​ឡើងវិញ"</string>
diff --git a/res/values-kn-rIN/filtershow_strings.xml b/res/values-kn-rIN/filtershow_strings.xml
index c37ef5f84..171d99514 100644
--- a/res/values-kn-rIN/filtershow_strings.xml
+++ b/res/values-kn-rIN/filtershow_strings.xml
@@ -124,7 +124,7 @@
<string name="color_border_color" msgid="8765458414425980711">"ಬಣ್ಣ"</string>
<string name="color_border_clear" msgid="4418261191091091722">"ತೆರವುಗೊಳಿಸು"</string>
<string name="color_pick_select" msgid="734312818059057394">"ಕಸ್ಟಮ್ ಬಣ್ಣವನ್ನು ಆರಿಸಿ"</string>
- <string name="color_pick_title" msgid="6195567431995308876">"ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="color_pick_title" msgid="6195567431995308876">"ಬಣ್ಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="draw_size_title" msgid="3121649039610273977">"ಗಾತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"ಸರಿ"</string>
<string name="state_panel_original" msgid="9069584409934164419">"ಮೂಲ ಚಿತ್ರ"</string>
diff --git a/res/values-ml-rIN/filtershow_strings.xml b/res/values-ml-rIN/filtershow_strings.xml
index 777519afd..68a4111e9 100644
--- a/res/values-ml-rIN/filtershow_strings.xml
+++ b/res/values-ml-rIN/filtershow_strings.xml
@@ -103,13 +103,13 @@
<string name="editor_chan_sat_cyan" msgid="1367634650172508288">"സിയാൻ"</string>
<string name="editor_chan_sat_blue" msgid="384409736863387895">"നീല"</string>
<string name="editor_chan_sat_magenta" msgid="6689215719351415546">"മജന്ത"</string>
- <string name="editor_grad_style" msgid="2168414479007745179">"സ്റ്റൈൽ"</string>
+ <string name="editor_grad_style" msgid="2168414479007745179">"ശൈലി"</string>
<string name="editor_grad_new" msgid="4857265951369377379">"പുതിയത്"</string>
<string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
<string name="curves_channel_red" msgid="4199710104162111357">"ചുവപ്പ്"</string>
<string name="curves_channel_green" msgid="3733003466905031016">"പച്ച"</string>
<string name="curves_channel_blue" msgid="9129211507395079371">"നീല"</string>
- <string name="draw_style" msgid="2036125061987325389">"സ്റ്റൈൽ"</string>
+ <string name="draw_style" msgid="2036125061987325389">"ശൈലി"</string>
<string name="draw_size" msgid="4360005386104151209">"വലുപ്പം"</string>
<string name="draw_hue" msgid="4975135843189267133">"ഹ്യൂ"</string>
<string name="draw_saturation" msgid="5394395648014454882">"സാച്ചുറേഷൻ"</string>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 436ecbb8b..d0056fcfd 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -21,7 +21,7 @@ import android.content.Context;
import android.content.ContentValues;
import android.content.Intent;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmRights;
import android.drm.DrmStore.Action;
import android.drm.DrmStore.DrmDeliveryType;
@@ -367,7 +367,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
Log.d(TAG, "pickPhoto:path = " + path);
if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) {
- DrmManagerClient drmClient = new DrmManagerClient(context);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(context);
path = path.replace("/storage/emulated/0", "/storage/emulated/legacy");
int status = -1;
Log.d(TAG, "pickPhoto:item type = " + Integer.toString(item.getMediaType()));
@@ -381,10 +381,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
+ Integer.toString(status));
ContentValues values = drmClient.getMetadata(path);
-
- // This hack is added to work FL. It will remove after the sdcard permission issue solved
- status = RightsStatus.RIGHTS_VALID;
-
if (RightsStatus.RIGHTS_VALID!= status) {
String address = values.getAsString("Rights-Issuer");
Log.d(TAG, "pickPhoto:address = " + address);
@@ -454,7 +450,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
path = ((LocalMediaItem)item).filePath;
}
if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) {
- DrmManagerClient drmClient = new DrmManagerClient((Context) mActivity);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper((Context) mActivity);
path = path.replace("/storage/emulated/0", "/storage/emulated/legacy");
ContentValues values = drmClient.getMetadata(path);
int drmType = values.getAsInteger("DRM-TYPE");
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index a82c64e12..288472793 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -24,7 +24,7 @@ import android.content.Context;
import android.content.ContentValues;
import android.content.Intent;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmRights;
import android.drm.DrmStore.Action;
import android.drm.DrmStore.DrmDeliveryType;
@@ -286,7 +286,7 @@ public class AlbumSetPage extends ActivityState implements
Log.d(TAG, "pickAlbum:path = " + path);
if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) {
- DrmManagerClient drmClient = new DrmManagerClient(context);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(context);
int status = -1;
path = path.replace("/storage/emulated/0", "/storage/emulated/legacy");
Log.d(TAG, "pickAlbum:item type = " + Integer.toString(item.getMediaType()));
@@ -300,9 +300,6 @@ public class AlbumSetPage extends ActivityState implements
ContentValues values = drmClient.getMetadata(path);
- // This hack is added to work FL. It will remove after the sdcard permission issue solved
- status = RightsStatus.RIGHTS_VALID;
-
if (RightsStatus.RIGHTS_VALID != status) {
String address = values.getAsString("Rights-Issuer");
Log.d(TAG, "pickAlbum:address = " + address);
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index e04f8fdaf..d918e1457 100644
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -24,6 +24,7 @@ import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.database.Cursor;
import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.Action;
import android.drm.DrmStore.DrmDeliveryType;
import android.drm.DrmStore.RightsStatus;
@@ -59,6 +60,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
public static final String KEY_TYPE_BITS = "type-bits";
public static final String KEY_MEDIA_TYPES = "mediaTypes";
public static final String KEY_DISMISS_KEYGUARD = "dismiss-keyguard";
+ public static final String KEY_FROM_SNAPCAM = "from-snapcam";
private static final String TAG = "GalleryActivity";
private Dialog mVersionCheckDialog;
@@ -251,12 +253,8 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
Log.d(TAG,"imagePath=" + imagePath);
if (intent.getBooleanExtra("WidgetClick", false) == true) {
- DrmManagerClient drmClient = new DrmManagerClient(this);
-
- // This hack is added to work FL. It will remove after the sdcard permission issue solved
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this);
int status = drmClient.checkRightsStatus(imagePath, Action.DISPLAY);
- status = RightsStatus.RIGHTS_VALID;
-
if (RightsStatus.RIGHTS_VALID != status) {
ContentValues values = drmClient.getMetadata(imagePath);
String address = values.getAsString("Rights-Issuer");
@@ -270,7 +268,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
if (imagePath != null
&& (imagePath.endsWith(".dcf") || imagePath.endsWith(".dm"))) {
- DrmManagerClient drmClient = new DrmManagerClient(this);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this);
imagePath = imagePath.replace("/storage/emulated/0", "/storage/emulated/legacy");
ContentValues values = drmClient.getMetadata(imagePath);
int drmType = values.getAsInteger("DRM-TYPE");
@@ -289,7 +287,9 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
Path albumPath = dm.getDefaultSetOf(itemPath);
data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, itemPath.toString());
- data.putBoolean(PhotoPage.KEY_READONLY, true);
+ if (!intent.getBooleanExtra(KEY_FROM_SNAPCAM, false)) {
+ data.putBoolean(PhotoPage.KEY_READONLY, true);
+ }
// TODO: Make the parameter "SingleItemOnly" public so other
// activities can reference it.
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 31370cbee..0b0341ad1 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -18,6 +18,7 @@ package com.android.gallery3d.app;
import android.annotation.TargetApi;
import android.app.ActionBar;
+import android.app.ActionBar.OnMenuVisibilityListener;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.KeyguardManager;
@@ -37,7 +38,7 @@ import android.content.res.Configuration;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.DrmDeliveryType;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
@@ -265,6 +266,18 @@ public class MovieActivity extends Activity {
ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE,
ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
+ actionBar.addOnMenuVisibilityListener(new OnMenuVisibilityListener() {
+ @Override
+ public void onMenuVisibilityChanged(boolean isVisible) {
+ if (mPlayer != null) {
+ if (isVisible) {
+ mPlayer.cancelHidingController();
+ } else {
+ mPlayer.restartHidingController();
+ }
+ }
+ }
+ });
String title = intent.getStringExtra(Intent.EXTRA_TITLE);
if (title != null) {
actionBar.setTitle(title);
@@ -319,7 +332,7 @@ public class MovieActivity extends Activity {
}
Log.d(TAG, "onCreateOptionsMenu= " + path);
if ((path != null) && ((path.endsWith(".dcf") || path.endsWith(".dm")))) {
- DrmManagerClient drmClient = new DrmManagerClient(this);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(this);
ContentValues values = drmClient.getMetadata(path);
int drmType = values.getAsInteger("DRM-TYPE");
Log.d(TAG, "onCreateOptionsMenu:DRM-TYPE = " + Integer.toString(drmType));
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index 93fc3cf79..bb25882c8 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -196,7 +196,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
maybeStartHiding();
}
- private void maybeStartHiding() {
+ public void maybeStartHiding() {
cancelHiding();
if (mState == State.PLAYING) {
handler.postDelayed(startHidingRunnable, 2500);
@@ -221,7 +221,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
}
}
- private void cancelHiding() {
+ public void cancelHiding() {
handler.removeCallbacks(startHidingRunnable);
if (mOverlayExt.canHidePanel()) {
mBackground.setAnimation(null);
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index e6702b583..4c0df84cc 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -1575,6 +1575,18 @@ public class MoviePlayer implements
videoPlayerData, 0);
return (mPrefs.getInt(slectedStepOption, stepOptionThreeSeconds) + 1) * stepBase;
}
+
+ public void restartHidingController() {
+ if (mController != null) {
+ mController.maybeStartHiding();
+ }
+ }
+
+ public void cancelHidingController() {
+ if (mController != null) {
+ mController.cancelHiding();
+ }
+ }
}
class Bookmarker {
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index b5a4d5640..7bc9c9d4f 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -26,7 +26,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.Action;
import android.drm.DrmStore.DrmDeliveryType;
import android.drm.DrmStore.RightsStatus;
@@ -770,7 +770,7 @@ public abstract class PhotoPage extends ActivityState implements
}
if (filepath != null && filepath.endsWith(".dcf")) {
- DrmManagerClient drmClient = new DrmManagerClient(mActivity.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mActivity.getAndroidContext());
filepath = filepath.replace("/storage/emulated/0", "/storage/emulated/legacy");
ContentValues values = drmClient.getMetadata(filepath);
int drmType = values.getAsInteger("DRM-TYPE");
@@ -1433,13 +1433,9 @@ public abstract class PhotoPage extends ActivityState implements
path = uri.getPath();
}
if (path.endsWith(".dcf")) {
- DrmManagerClient drmClient = new DrmManagerClient(activity);
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(activity);
path = path.replace("/storage/emulated/0", "/storage/emulated/legacy");
-
- // This hack is added to work FL. It will remove after the sdcard permission issue solved
int status = drmClient.checkRightsStatus(path, Action.PLAY);
- status = RightsStatus.RIGHTS_VALID;
-
if (RightsStatus.RIGHTS_VALID != status) {
ContentValues values = drmClient.getMetadata(path);
String address = values.getAsString("Rights-Issuer");
diff --git a/src/com/android/gallery3d/data/ImageCacheRequest.java b/src/com/android/gallery3d/data/ImageCacheRequest.java
index f93f6e28a..8fb418dd7 100644
--- a/src/com/android/gallery3d/data/ImageCacheRequest.java
+++ b/src/com/android/gallery3d/data/ImageCacheRequest.java
@@ -16,7 +16,7 @@
package com.android.gallery3d.data;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.Action;
import android.drm.DrmStore.RightsStatus;
import android.graphics.Bitmap;
@@ -61,15 +61,10 @@ abstract class ImageCacheRequest implements Job<Bitmap> {
ImageCacheService cacheService = mApplication.getImageCacheService();
if (mFilePath != null && mFilePath.endsWith(".dcf")) {
- DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext());
mFilePath = mFilePath.replace("/storage/emulated/0", "/storage/emulated/legacy");
-
- // This hack is added to work FL. It will remove after the sdcard permission issue solved
int statusDisplay = drmClient.checkRightsStatus(mFilePath, Action.DISPLAY);
- statusDisplay = RightsStatus.RIGHTS_VALID;
int statusPlay = drmClient.checkRightsStatus(mFilePath, Action.PLAY);
- statusPlay = RightsStatus.RIGHTS_VALID;
-
if (mMimeType == null) {
if ((RightsStatus.RIGHTS_VALID != statusDisplay)
&& (RightsStatus.RIGHTS_VALID != statusPlay)) {
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index 32c4880d7..96ab3e3a1 100644
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -20,7 +20,7 @@ import android.annotation.TargetApi;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.DrmDeliveryType;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -242,7 +242,7 @@ public class LocalImage extends LocalMediaItem {
if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) {
filePath = filePath.replace("/storage/emulated/0", "/storage/emulated/legacy");
operation |= SUPPORT_DRM_INFO;
- DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext());
ContentValues values = drmClient.getMetadata(filePath);
int drmType = values.getAsInteger("DRM-TYPE");
Log.d(TAG, "getSupportedOperations:drmType returned= "
diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java
index d5e21e983..12b3c7acd 100644
--- a/src/com/android/gallery3d/data/LocalVideo.java
+++ b/src/com/android/gallery3d/data/LocalVideo.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.data;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.DrmDeliveryType;
import android.graphics.Bitmap;
import android.graphics.BitmapRegionDecoder;
@@ -189,7 +189,7 @@ public class LocalVideo extends LocalMediaItem {
int supported = SUPPORT_DELETE | SUPPORT_PLAY | SUPPORT_INFO;
if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) {
supported |= SUPPORT_DRM_INFO;
- DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext());
ContentValues values = drmClient.getMetadata(filePath);
int drmType = values.getAsInteger("DRM-TYPE");
Log.d("LocalVideo", "getSupportedOperations:drmType returned= "
diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java
index fba34a0b3..b9a12e7b7 100644
--- a/src/com/android/gallery3d/data/UriImage.java
+++ b/src/com/android/gallery3d/data/UriImage.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.data;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.database.Cursor;
-import android.drm.DrmManagerClient;
+import android.drm.DrmManagerClientWrapper;
import android.drm.DrmStore.DrmDeliveryType;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
@@ -239,7 +239,7 @@ public class UriImage extends MediaItem {
if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) {
supported |= SUPPORT_DRM_INFO;
filePath = filePath.replace("/storage/emulated/0", "/storage/emulated/legacy");
- DrmManagerClient drmClient = new DrmManagerClient(mApplication.getAndroidContext());
+ DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(mApplication.getAndroidContext());
ContentValues values = drmClient.getMetadata(filePath);
int drmType = values.getAsInteger("DRM-TYPE");
Log.d(TAG, "getSupportedOperations:drmType returned= "
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 04:27:23 +0000