diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-05-04 15:26:02 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2012-05-04 15:28:06 +0800 |
| commit | aa29fadb1921b8276ba19cdbf09082f84546480b (patch) | |
| tree | 9d959154d818ad4dfee140bcd8f95f0fb5f1c158 | |
| parent | e9faef758abc46fbe6c63ac4dbeba1f04c40b14b (diff) | |
| download | android_packages_apps_Snap-aa29fadb1921b8276ba19cdbf09082f84546480b.tar.gz android_packages_apps_Snap-aa29fadb1921b8276ba19cdbf09082f84546480b.tar.bz2 android_packages_apps_Snap-aa29fadb1921b8276ba19cdbf09082f84546480b.zip | |
Use activity-alias to disable camera icon dynamically.
Bug: 6438794
Change-Id: Ie2184979f95187eac2411f07b8caee2cad4c4add
| -rw-r--r-- | AndroidManifest.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 86d2c9ba9..3b4627f99 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -262,11 +262,6 @@ android:screenOrientation="behind" 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> - <intent-filter> <action android:name="android.media.action.IMAGE_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> @@ -275,6 +270,18 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> + + <activity-alias android:icon="@mipmap/ic_launcher_camera" + android:label="@string/camera_label" + android:name="com.android.camera.CameraLauncher" + android:targetActivity="com.android.camera.Camera" > + <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> + <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" |