summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-01 16:14:39 +0800
committerOwen Lin <owenlin@google.com>2012-08-01 16:14:39 +0800
commit876e2d37e7f4e69b5779683b68bf412df5a957d5 (patch)
treeafd554b5c6abf9f873e03583fee6dbb1dc607292 /src
parent9bea81c2ae6d2d5be8643511ea7e644a26231868 (diff)
downloadandroid_packages_apps_Snap-876e2d37e7f4e69b5779683b68bf412df5a957d5.tar.gz
android_packages_apps_Snap-876e2d37e7f4e69b5779683b68bf412df5a957d5.tar.bz2
android_packages_apps_Snap-876e2d37e7f4e69b5779683b68bf412df5a957d5.zip
Remove /mtp from TOP_SET_PATH before HC.
bug: 6913061 Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/data/DataManager.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java
index 9485b0274..386f6c3fc 100644
--- a/src/com/android/gallery3d/data/DataManager.java
+++ b/src/com/android/gallery3d/data/DataManager.java
@@ -68,18 +68,22 @@ public class DataManager {
private static final String TAG = "DataManager";
// This is the path for the media set seen by the user at top level.
- private static final String TOP_SET_PATH =
- "/combo/{/mtp,/local/all,/picasa/all}";
- private static final String TOP_IMAGE_SET_PATH =
- "/combo/{/mtp,/local/image,/picasa/image}";
+ private static final String TOP_SET_PATH = ApiHelper.HAS_MTP
+ ? "/combo/{/mtp,/local/all,/picasa/all}"
+ : "/combo/{/local/all,/picasa/all}";
+
+ private static final String TOP_IMAGE_SET_PATH = ApiHelper.HAS_MTP
+ ? "/combo/{/mtp,/local/image,/picasa/image}"
+ : "/combo/{/local/image,/picasa/image}";
+
private static final String TOP_VIDEO_SET_PATH =
"/combo/{/local/video,/picasa/video}";
- private static final String TOP_LOCAL_SET_PATH =
- "/local/all";
- private static final String TOP_LOCAL_IMAGE_SET_PATH =
- "/local/image";
- private static final String TOP_LOCAL_VIDEO_SET_PATH =
- "/local/video";
+
+ private static final String TOP_LOCAL_SET_PATH = "/local/all";
+
+ private static final String TOP_LOCAL_IMAGE_SET_PATH = "/local/image";
+
+ private static final String TOP_LOCAL_VIDEO_SET_PATH = "/local/video";
private static final String ACTION_DELETE_PICTURE =
"com.android.gallery3d.action.DELETE_PICTURE";