diff options
| author | Weijie Wang <weijiew@codeaurora.org> | 2017-08-29 17:52:48 +0800 |
|---|---|---|
| committer | Weijie Wang <weijiew@codeaurora.org> | 2017-08-30 10:45:01 +0800 |
| commit | b5533d51a7c97138235d29b35cec876d107aeadd (patch) | |
| tree | 3f92fc9d76f37f0efa4ee150322ebfdff50cb2c5 /AndroidManifest.xml | |
| parent | cc7d48d76185ed95ff9b00dcc23373186257b03b (diff) | |
| download | android_packages_apps_Snap-b5533d51a7c97138235d29b35cec876d107aeadd.tar.gz android_packages_apps_Snap-b5533d51a7c97138235d29b35cec876d107aeadd.tar.bz2 android_packages_apps_Snap-b5533d51a7c97138235d29b35cec876d107aeadd.zip | |
SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3
Sync LA.UM.6.4 to LA.UM.6.3
Change-Id: Ide9a53b3b5ea6d17154003e4059ae3125f9f3346
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r--[-rwxr-xr-x] | AndroidManifest.xml | 70 |
1 files changed, 28 insertions, 42 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1b8a88d2d..92e8b7f35 100755..100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,7 +53,8 @@ android:screenOrientation="portrait" android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/Theme.Camera" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan" > + android:windowSoftInputMode="stateAlwaysHidden|adjustPan" + android:visibleToInstantApps="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -69,10 +70,32 @@ android:label="@string/app_name" android:launchMode="singleTop" android:configChanges="orientation|screenSize|keyboardHidden" - android:parentActivityName="com.android.camera.CameraActivity" > - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value="com.android.camera.CameraActivity" /> + 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" /> </activity> <activity @@ -110,43 +133,6 @@ </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" |