Merge heads

This commit is contained in:
youtaol
2013-02-01 13:05:31 +08:00
12 changed files with 886 additions and 20 deletions
@@ -38,6 +38,7 @@ import com.google.api.services.drive.DriveScopes;
import com.google.api.services.drive.model.File;
import com.google.api.services.drive.model.FileList;
import com.google.api.services.drive.model.ParentReference;
import com.google.common.annotations.VisibleForTesting;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -74,9 +75,10 @@ public class SyncUtils {
public static final String KML_MIME_TYPE = "application/vnd.google-earth.kml+xml";
public static final String GET_KML_FILES_QUERY = "'%s' in parents and mimeType = '"
+ KML_MIME_TYPE + "' and trashed = false";
private static final String FOLDER_MIME_TYPE = "application/vnd.google-apps.folder";
private static final String GET_MY_TRACKS_FOLDER_QUERY =
@VisibleForTesting
public static final String GET_MY_TRACKS_FOLDER_QUERY =
"'root' in parents and title = '%s' and mimeType = '" + FOLDER_MIME_TYPE
+ "' and trashed = false";