diff options
author | Weijie Wang <weijiew@codeaurora.org> | 2017-09-02 12:11:20 +0800 |
---|---|---|
committer | Weijie Wang <weijiew@codeaurora.org> | 2017-09-02 12:11:20 +0800 |
commit | f884ef3a01cefaf71f6ff0ed059c8d356b40c17c (patch) | |
tree | b4b545a0cd632402dddc406247fcd7836b408b84 /AndroidManifest.xml | |
parent | 2e0ed791732a27bb4d951bfbdaba3ddcda4e6b2c (diff) | |
download | android_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.tar.gz android_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.tar.bz2 android_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.zip |
Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"
This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd.
Change-Id: I8063422680802e25d03a374be91e884a86ad55e9
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-x[-rw-r--r--] | AndroidManifest.xml | 70 |
1 files changed, 42 insertions, 28 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 92e8b7f35..1b8a88d2d 100644..100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,8 +53,7 @@ android:screenOrientation="portrait" android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/Theme.Camera" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan" - android:visibleToInstantApps="true"> + android:windowSoftInputMode="stateAlwaysHidden|adjustPan" > <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -70,32 +69,10 @@ android:label="@string/app_name" android:launchMode="singleTop" android:configChanges="orientation|screenSize|keyboardHidden" - android:parentActivityName="com.android.camera.CameraActivity" - android:visibleToInstantApps="true"> - - <intent-filter> - <action android:name="android.media.action.VIDEO_CAMERA" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - - <intent-filter> - <action android:name="android.media.action.VIDEO_CAPTURE" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - - <intent-filter> - <action android:name="android.media.action.IMAGE_CAPTURE" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - - <intent-filter> - <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value="com.android.camera.CameraActivity" /> + android:parentActivityName="com.android.camera.CameraActivity" > + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.android.camera.CameraActivity" /> </activity> <activity @@ -133,6 +110,43 @@ </intent-filter> </activity-alias> + <activity-alias + android:name="com.android.camera.PhotoCamera" + android:icon="@mipmap/ic_launcher_camera" + android:label="@string/snapcam_app_name" + android:launchMode="singleTop" + android:targetActivity="com.android.camera.PermissionsActivity"> + <intent-filter> + <action android:name="android.media.action.IMAGE_CAPTURE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <intent-filter> + <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <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" + android:icon="@mipmap/ic_launcher_video_camera" + android:label="@string/video_camera_label" + android:launchMode="singleTop" + android:targetActivity="com.android.camera.PermissionsActivity"> + <intent-filter> + <action android:name="android.media.action.VIDEO_CAMERA" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <intent-filter> + <action android:name="android.media.action.VIDEO_CAPTURE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity-alias> + <activity android:name="com.android.camera.SecureCameraActivity" android:clearTaskOnLaunch="true" |