diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2015-01-15 17:19:29 +0800 |
|---|---|---|
| committer | kaiyiz <kaiyiz@codeaurora.org> | 2015-01-15 17:19:29 +0800 |
| commit | 15f6eac99800bb140a137a1234637d187b83c134 (patch) | |
| tree | 38ecfe61a29db88d9c1eb46e4c03d3de57745744 /AndroidManifest.xml | |
| parent | ee168be7e40e15c1921b32f6b863ad3843c91bfd (diff) | |
| download | android_packages_apps_Snap-15f6eac99800bb140a137a1234637d187b83c134.tar.gz android_packages_apps_Snap-15f6eac99800bb140a137a1234637d187b83c134.tar.bz2 android_packages_apps_Snap-15f6eac99800bb140a137a1234637d187b83c134.zip | |
SnapdragonCamera: fix malformed manifest
activity-alias has to be put after the target activity.
CRs-Fixed: 777770
Change-Id: I25d5af2311d8e0d1a575f69ffd9f2d1d7e1e6721
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c827e6013..d6c80f501 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,18 +93,6 @@ </intent-filter> </activity-alias> - <activity-alias - android:name="com.android.camera.CameraGestureActivity" - android:icon="@mipmap/ic_launcher_camera" - android:label="@string/camera_gesture_title" - android:targetActivity="com.android.camera.SecureCameraActivity"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity-alias> - <!-- Video camera and capture use the Camcorder label and icon. --> <activity-alias android:name="com.android.camera.VideoCamera" @@ -150,6 +138,17 @@ android:resource="@layout/keyguard_widget" /> </activity> + <activity-alias + android:name="com.android.camera.CameraGestureActivity" + android:icon="@mipmap/ic_launcher_camera" + android:label="@string/camera_gesture_title" + android:targetActivity="com.android.camera.SecureCameraActivity"> + <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.crop.CropActivity" android:label="@string/crop_action" |