summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java4
-rw-r--r--src/com/android/camera/ui/CameraSwitcher.java8
-rw-r--r--src_pd/com/android/gallery3d/util/RefocusHelper.java25
3 files changed, 36 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index d875670..7013036 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -50,6 +50,7 @@ import com.android.camera.ui.FilmStripView;
import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.util.LightCycleHelper;
+import com.android.gallery3d.util.RefocusHelper;
public class CameraActivity extends Activity
implements CameraSwitchListener {
@@ -477,6 +478,9 @@ public class CameraActivity extends Activity
case CameraSwitcher.LIGHTCYCLE_MODULE_INDEX:
mCurrentModule = LightCycleHelper.createPanoramaModule();
break;
+ case CameraSwitcher.REFOCUS_MODULE_INDEX:
+ mCurrentModule = RefocusHelper.createRefocusModule();
+ break;
default:
break;
}
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 90d88d2..6e43215 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -49,10 +49,12 @@ public class CameraSwitcher extends RotateImageView
public static final int PHOTO_MODULE_INDEX = 0;
public static final int VIDEO_MODULE_INDEX = 1;
public static final int LIGHTCYCLE_MODULE_INDEX = 2;
+ public static final int REFOCUS_MODULE_INDEX = 3;
private static final int[] DRAW_IDS = {
R.drawable.ic_switch_camera,
R.drawable.ic_switch_video,
- R.drawable.ic_switch_photosphere
+ R.drawable.ic_switch_photosphere,
+ R.drawable.ic_switch_refocus
};
public interface CameraSwitchListener {
public void onCameraSelected(int i);
@@ -186,6 +188,10 @@ public class CameraSwitcher extends RotateImageView
item.setContentDescription(getContext().getResources().getString(
R.string.accessibility_switch_to_new_panorama));
break;
+ case R.drawable.ic_switch_refocus:
+ item.setContentDescription(getContext().getResources().getString(
+ R.string.accessibility_switch_to_refocus));
+ break;
default:
break;
}
diff --git a/src_pd/com/android/gallery3d/util/RefocusHelper.java b/src_pd/com/android/gallery3d/util/RefocusHelper.java
new file mode 100644
index 0000000..39ded47
--- /dev/null
+++ b/src_pd/com/android/gallery3d/util/RefocusHelper.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+ }
+}