Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

1 files changed, 31 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
new file mode 100644
index 000000000..5d06ad195
--- /dev/null
+++ b/src/com/android/camera/CameraActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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 com.android.gallery3d.util.CameraHelper;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/** Trampoline activity that launches the new Camera activity defined in CameraHelper. */
+public class CameraActivity extends Activity {
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        startActivity(CameraHelper.CAMERA_LAUNCHER_INTENT);
+        finish();
+    }
+}