Add a trampoline activity to launch new Camera

This preserves shortcuts, if any, to the Camera activity in the old
package name.

Bug: 10312966
Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7aee866..4a5da18 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -171,6 +171,21 @@
             </intent-filter>
         </activity-alias>
 
+        <!-- This activity acts as a trampoline to the new Camera activity
+             in com.android.camera2 package, so that existing shortcuts
+             are preserved. -->
+        <activity android:name="com.android.camera.CameraActivity"
+            android:icon="@mipmap/ic_launcher_camera"
+            android:label="@string/camera_label"
+            android:theme="@style/android:Theme.NoDisplay" />
+        <activity-alias android:name="com.android.camera.CameraLauncher"
+            android:targetActivity="com.android.camera.CameraActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
          <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
          media from attached MTP devices, like cameras and camera phones -->
         <activity android:launchMode="singleInstance"

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
new file mode 100644 (file)
index 0000000..5d06ad1
--- /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();
+    }
+}

diff --git a/src_pd/com/android/gallery3d/util/CameraHelper.java b/src_pd/com/android/gallery3d/util/CameraHelper.java
new file mode 100644 (file)
index 0000000..87ca038
--- /dev/null
+++ b/src_pd/com/android/gallery3d/util/CameraHelper.java
@@ -0,0 +1,24 @@
+/*
+ * 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 android.content.Intent;
+
+public class CameraHelper {
+
+    public static final Intent CAMERA_LAUNCHER_INTENT = new Intent(Intent.ACTION_MAIN)
+        .setClassName("com.android.camera2", "com.android.camera.CameraActivity");
+}