X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=AndroidManifest.xml;h=c5fdb6653f5a8bbbcc81ec0382081cdce02f198f;hb=4df3011e2f3680a80ecc89c817ba528b2a578f0f;hp=284b361dc55199c7cd6e6304dff87902b355a851;hpb=0be64680fb9b5a982b1b92730236ebb85e76624a;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 284b361dc..c5fdb6653 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="21" />
+        android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -19,7 +19,6 @@
     <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" />
@@ -42,10 +41,9 @@
     <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" >
@@ -53,17 +51,12 @@
             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>
@@ -77,9 +70,18 @@
                 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>
@@ -90,12 +92,23 @@
             </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" />
@@ -111,11 +124,9 @@
             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" />