From 09473aa0a53d451c791ca402a343e49cce2c31c5 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Thu, 11 Oct 2012 14:06:45 -0700
Subject: [PATCH] Alias com.android.camera.Camera to point at CameraActivity

bug:7291128
Change-Id: Id6649024516ba79fa042284db95d29a37552eef4
---
 AndroidManifest.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eda881508..b96042fa2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -288,15 +288,6 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Gallery.Dialog"/>
 
-        <activity android:name="com.android.camera.Camera"
-                android:taskAffinity="com.android.camera.Camera"
-                android:label="@string/camera_label"
-                android:theme="@style/Theme.Camera"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-        </activity>
-
         <activity android:name="com.android.camera.CameraActivity"
                 android:taskAffinity="com.android.camera.CameraActivity"
                 android:label="@string/camera_label"
@@ -353,6 +344,16 @@
             </intent-filter>
         </activity-alias>
 
+        <activity-alias android:icon="@mipmap/ic_launcher_camera"
+                        android:label="@string/camera_label"
+                        android:name="com.android.camera.Camera"
+                        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>
+
         <activity android:name="com.android.camera.VideoCamera"
                 android:taskAffinity="com.android.camera"
                 android:label="@string/video_camera_label"
-- 
2.11.0