From acd4e11ac09816721ebbbed0811c0fdf93ada9cf Mon Sep 17 00:00:00 2001
From: Mangesh Ghiware <mghiware@google.com>
Date: Tue, 13 Aug 2013 17:10:58 -0700
Subject: Add activity-alias for Camera.

Similar to the one in Gallery2 manifest.

Bug: 10312966
Change-Id: I5325f8cfeba2a3825cd5604d4fee7c209067aba1
---
 AndroidManifest.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b7748dfe3..7eed9c8c8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,17 +71,25 @@
                 <action android:name="android.media.action.VIDEO_CAPTURE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
+            <meta-data
+                android:name="com.android.keyguard.layout"
+                android:resource="@layout/keyguard_widget" />
+        </activity>
+
+        <activity-alias
+            android:name="com.android.camera.CameraLauncher"
+            android:icon="@mipmap/ic_launcher_camera"
+            android:label="@string/app_name"
+            android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity-alias>
 
-            <meta-data
-                android:name="com.android.keyguard.layout"
-                android:resource="@layout/keyguard_widget" />
-        </activity>
         <activity
             android:name="com.android.camera.SecureCameraActivity"
             android:clearTaskOnLaunch="true"
-- 
cgit v1.2.3