diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-07-27 00:20:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-27 00:20:15 +0000 |
| commit | 9d1cd3ec768cac1142de259a676893a08141a6d3 (patch) | |
| tree | 33bad4eaa502dec46ecd6a5aa867f7e647ab6ad3 /src | |
| parent | 3dbed24b638141342323373d97954532c44320ac (diff) | |
| parent | 77fb852da18c6ee8ba1f1037f385319eb47bdce6 (diff) | |
| download | android_packages_apps_Snap-9d1cd3ec768cac1142de259a676893a08141a6d3.tar.gz android_packages_apps_Snap-9d1cd3ec768cac1142de259a676893a08141a6d3.tar.bz2 android_packages_apps_Snap-9d1cd3ec768cac1142de259a676893a08141a6d3.zip | |
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraSwitcher.java | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index d8756701d..701303653 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 90d88d29a..6e4321571 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; } |