summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-08 11:27:09 -0700
committerSascha Haeberling <haeberling@google.com>2013-08-08 18:31:53 -0700
commit723bf81990245a07739146ac10357703c9839de1 (patch)
tree0c86a8a133077db5191907a760d5f4b3ab441b77 /src_pd
parenta6b80cccafe0a4c2de575ec69d1960c3c0d88062 (diff)
downloadandroid_packages_apps_Gallery2-723bf81990245a07739146ac10357703c9839de1.tar.gz
android_packages_apps_Gallery2-723bf81990245a07739146ac10357703c9839de1.tar.bz2
android_packages_apps_Gallery2-723bf81990245a07739146ac10357703c9839de1.zip
Remove Camera from Gallery2.
Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/PanoramaStitchingManager.java41
-rw-r--r--src_pd/com/android/gallery3d/util/LightCycleHelper.java21
-rw-r--r--src_pd/com/android/gallery3d/util/RefocusHelper.java25
3 files changed, 0 insertions, 87 deletions
diff --git a/src_pd/com/android/camera/PanoramaStitchingManager.java b/src_pd/com/android/camera/PanoramaStitchingManager.java
deleted file mode 100644
index 5ba16b863..000000000
--- a/src_pd/com/android/camera/PanoramaStitchingManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.camera;
-
-import android.content.Context;
-import android.net.Uri;
-
-class PanoramaStitchingManager implements ImageTaskManager {
-
- public PanoramaStitchingManager(Context ctx) {
- }
-
- @Override
- public void addTaskListener(TaskListener l) {
- // do nothing.
- }
-
- @Override
- public void removeTaskListener(TaskListener l) {
- // do nothing.
- }
-
- @Override
- public int getTaskProgress(Uri uri) {
- return -1;
- }
-}
diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index 7ef7699df..350882463 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -18,13 +18,8 @@ package com.android.gallery3d.util;
import android.content.ContentResolver;
import android.content.Context;
-import android.content.Intent;
import android.net.Uri;
-import com.android.camera.CameraModule;
-import com.android.gallery3d.app.GalleryApp;
-import com.android.gallery3d.app.StitchingProgressManager;
-
public class LightCycleHelper {
public static class PanoramaMetadata {
// Whether a panorama viewer should be used
@@ -40,26 +35,10 @@ public class LightCycleHelper {
public static final PanoramaMetadata NOT_PANORAMA = new PanoramaMetadata(false, false);
- public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
- /* Do nothing */
- }
-
- public static boolean hasLightCycleCapture(Context context) {
- return false;
- }
-
public static PanoramaMetadata getPanoramaMetadata(Context context, Uri uri) {
return NOT_PANORAMA;
}
- public static CameraModule createPanoramaModule() {
- return null;
- }
-
- public static StitchingProgressManager createStitchingManagerInstance(GalleryApp app) {
- return null;
- }
-
/**
* Get the file path from a Media storage URI.
*/
diff --git a/src_pd/com/android/gallery3d/util/RefocusHelper.java b/src_pd/com/android/gallery3d/util/RefocusHelper.java
deleted file mode 100644
index 39ded4740..000000000
--- a/src_pd/com/android/gallery3d/util/RefocusHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.gallery3d.util;
-
-import com.android.camera.CameraModule;
-
-public class RefocusHelper {
- public static CameraModule createRefocusModule() {
- return null;
- }
-}