From: Michael Kolb <kolby@google.com>
Date: Tue, 25 Sep 2012 02:42:34 +0000 (-0700)
Subject: Remove old camera activity from launcher
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~766^2~394^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5dbbfcd44ff6360cd46ec636b006c52b5ebd9293;p=android-x86%2Fpackages-apps-Camera2.git

Remove old camera activity from launcher

  Bug: 7201108

The old activity can still be started via:

adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera

Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f9035fa5d..bc0270b72 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -263,15 +263,9 @@
                 android:taskAffinity="com.android.camera.Camera"
                 android:label="@string/camera_label"
                 android:theme="@style/Theme.Camera"
-                android:icon="@drawable/ic_switch_camera_holo_light"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-            <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>
 
         <activity android:name="com.android.camera.CameraActivity"