diff options
| author | Owen Lin <owenlin@google.com> | 2012-08-01 01:28:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-01 01:28:09 -0700 |
| commit | e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d (patch) | |
| tree | 039490e6262e17f607e6e4f57e5e016bf6e8815a /src | |
| parent | 3f11bbe72c1245d981c3304b2b6a1a93de76edcf (diff) | |
| parent | 876e2d37e7f4e69b5779683b68bf412df5a957d5 (diff) | |
| download | android_packages_apps_Snap-e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d.tar.gz android_packages_apps_Snap-e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d.tar.bz2 android_packages_apps_Snap-e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d.zip | |
Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/data/DataManager.java | 24 |
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"; |