Merge "Include v4, use AAPT2" into oc-dev am: a09a333fd2

[android-x86/packages-apps-Camera2.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d8ae9e4..2d0aeeb 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -42,9 +42,11 @@
         android:icon="@mipmap/logo_camera_color_44in48dp"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:resizeableActivity="false"
         android:restoreAnyVersion="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Camera" >
+        android:theme="@style/Theme.Camera"
+        android:usesCleartextTraffic="false" >
         <activity
             android:name="com.android.camera.CameraActivity"
             android:clearTaskOnLaunch="true"