<data android:mimeType="vnd.android.cursor.dir/image" />
<data android:mimeType="vnd.android.cursor.dir/video" />
</intent-filter>
- <meta-data
- android:name="com.google.android.canvas.data.launcher_info"
- android:resource="@xml/canvas_info" />
</activity>
<!-- we add this activity-alias for shortcut backward compatibility -->
</activity>
<service android:name="com.android.gallery3d.app.BatchService" />
<service android:name="com.android.camera.MediaSaveService" />
+
<!-- canvas -->
<provider
- android:name="com.android.gallery3d.provider.CanvasProvider"
+ android:name="com.android.photos.canvas.CanvasProvider"
android:authorities="com.android.gallery3d.provider.CanvasProvider"
android:exported="true"
android:label="@string/app_name"
android:permission="android.permission.ACCESS_APP_BROWSE_DATA" />
+ <activity android:name="com.android.photos.canvas.EnableSyncActivity"
+ android:exported="true"
+ android:theme="@style/Theme.ProxyLauncher">
+ </activity>
+ <activity android:name="com.android.photos.canvas.CanvasActivity"
+ android:label="@string/app_name"
+ android:exported="true"
+ android:theme="@style/Theme.ProxyLauncher">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.google.android.canvas.category.BROWSE_LAUNCHER" />
+ </intent-filter>
+ <meta-data
+ android:name="com.google.android.canvas.data.launcher_info"
+ android:resource="@xml/canvas_info" />
+ </activity>
</application>
</manifest>
import com.android.gallery3d.data.MediaSet;
import com.android.gallery3d.data.Path;
import com.android.gallery3d.picasasource.PicasaSource;
-import com.android.gallery3d.provider.CanvasProvider;
import com.android.gallery3d.util.GalleryUtils;
public final class Gallery extends AbstractGalleryActivity implements OnCancelListener {
}
public void startDefaultPage() {
- if (CanvasProvider.startBrowseActivity(this)) {
- finish();
- return;
- }
PicasaSource.showSignInReminder(this);
Bundle data = new Bundle();
data.putString(AlbumSetPage.KEY_MEDIA_PATH,
--- /dev/null
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.photos.canvas;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.google.android.canvas.provider.CanvasContract;
+
+
+public class CanvasActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Intent intent = CanvasContract.getBrowseIntent(
+ CanvasProvider.BROWSER_ROOT_URI, 0);
+ startActivity(intent);
+ finish();
+ }
+}
* limitations under the License.
*/
-package com.android.gallery3d.provider;
+package com.android.photos.canvas;
import android.accounts.Account;
import android.accounts.AccountManager;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Intent;
import android.content.res.AssetFileDescriptor;
-import android.content.res.Configuration;
import android.database.MatrixCursor;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import com.android.gallery3d.util.ThreadPool.JobContext;
import com.google.android.canvas.data.Cluster;
import com.google.android.canvas.provider.CanvasContract;
-import com.google.android.canvas.provider.EnableSyncActivity;
import java.io.FileNotFoundException;
import java.io.IOException;
@Override
protected void buildBrowseRow(String[] projection, MatrixCursor c, Uri uri) {
+ // TODO: Switch to item_uri scheme b/8018482
int row = Integer.parseInt(uri.getLastPathSegment());
MediaSet album = loadRootMediaSet().getSubMediaSet(row);
loadMediaSet(album);
c.addRow(header);
}
}
-
- // TODO: Remove once b/8079561 is resolved
- public static boolean startBrowseActivity(Activity activity) {
- Configuration config = activity.getResources().getConfiguration();
- if (config.touchscreen == Configuration.TOUCHSCREEN_NOTOUCH) {
- try {
- Intent intent = CanvasContract.getBrowseIntent(
- BROWSER_ROOT_URI, 0);
- activity.startActivity(intent);
- return true;
- } catch (ActivityNotFoundException ex) {
- }
- }
- return false;
- }
-
}
* limitations under the License.
*/
-package com.android.gallery3d.provider;
+package com.android.photos.canvas;
import android.content.ContentProvider;
import android.content.ContentValues;
protected static final String PATH_BROWSE_HEADERS = PATH_BROWSE + "/"
+ CanvasContract.PATH_BROWSE_HEADERS;
+ public static final Uri BROWSER_ROOT_URI = Uri.parse("content://"
+ + AUTHORITY + "/" + PATH_BROWSE);
+
protected static final int LAUNCHER = 1;
protected static final int LAUNCHER_ITEMS = 2;
protected static final int LAUNCHER_ITEM_ID = 3;
protected static final int BROWSE_HEADERS = 4;
protected static final int BROWSE = 5;
protected static final int IMAGE = 6;
- protected static final Uri BROWSER_ROOT_URI = Uri.parse("content://"
- + AUTHORITY + "/" + PATH_BROWSE);
protected static final UriMatcher sUriMatcher = new UriMatcher(
UriMatcher.NO_MATCH);
-package com.google.android.canvas.provider;
+package com.android.photos.canvas;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.ContentResolver;
import android.os.Bundle;
-import com.android.gallery3d.provider.CanvasProvider;
-import com.android.gallery3d.provider.CanvasProviderBase;
public class EnableSyncActivity extends Activity {