<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+ xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.camera2">
<uses-sdk
android:minSdkVersion="19"
- android:targetSdkVersion="19" />
-
+ android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.NFC" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<application
android:name="com.android.camera.app.CameraApp"
android:hardwareAccelerated="true"
- android:icon="@mipmap/ic_launcher_camera"
+ android:icon="@mipmap/logo_camera_color_44in48dp"
android:label="@string/app_name"
android:largeHeap="true"
- android:logo="@mipmap/ic_launcher_camera"
android:restoreAnyVersion="true"
android:supportsRtl="true"
android:theme="@style/Theme.Camera" >
android:name="com.android.camera.CameraActivity"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:icon="@mipmap/ic_launcher_camera"
android:label="@string/app_name"
- android:logo="@mipmap/ic_launcher_camera"
+ android:launchMode="singleTask"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
<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>
android:resource="@layout/keyguard_widget" />
</activity>
+ <activity
+ android:name="com.android.camera.PermissionsActivity"
+ android:label="@string/app_name"
+ android:excludeFromRecents="true"
+ android:parentActivityName="com.android.camera.CameraActivity" >
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="com.android.camera.CameraActivity" />
+ </activity>
+
<activity-alias
android:name="com.android.camera.CameraLauncher"
- android:icon="@mipmap/ic_launcher_camera"
android:label="@string/app_name"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
</intent-filter>
</activity-alias>
+ <activity
+ android:name="com.android.camera.CaptureActivity"
+ android:label="@string/app_name"
+ android:theme="@style/Theme.Camera"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+ <intent-filter>
+ <action android:name="android.media.action.IMAGE_CAPTURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<!-- 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:targetActivity="com.android.camera.CameraActivity">
+ android:targetActivity="com.android.camera.CaptureActivity">
<intent-filter>
<action android:name="android.media.action.VIDEO_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
- android:icon="@mipmap/ic_launcher_camera"
android:label="@string/app_name"
- android:logo="@mipmap/ic_launcher_camera"
android:taskAffinity="com.android.camera.SecureCameraActivity"
- android:theme="@style/Theme.Camera"
+ android:theme="@style/Theme.SecureCamera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
<intent-filter>
<action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
</activity>
<activity
- android:name="com.android.camera.crop.CropActivity"
- android:label="@string/crop_action"
- android:theme="@style/Theme.Crop"
- android:configChanges="keyboardHidden|orientation|screenSize">
- </activity>
-
- <activity
android:name="com.android.camera.settings.CameraSettingsActivity"
android:label="@string/mode_settings"
android:theme="@style/Theme.CameraSettings"