X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=blobdiff_plain;f=AndroidManifest.xml;h=7c99aa94fec313c6eb78eab937488535fcba9d24;hp=7b372a8d0a54f5ead0bc1ff6430ecd589bed5674;hb=2d66c82fbe2cf8f35a325a5e0baa1cff6bf3cfb0;hpb=1f001741cc6dbcf94dde32bb0f768e3b4ff6b3ac

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b372a8d0..7c99aa94f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
@@ -43,8 +43,10 @@
             android:hardwareAccelerated="true"
             android:largeHeap="true"
             android:restoreAnyVersion="true"
-            android:supportsRtl="true">
+            android:supportsRtl="true"
+            usesCleartextHttp="true">
         <uses-library android:name="com.google.android.media.effects" android:required="false" />
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
         <activity android:name="com.android.gallery3d.app.MovieActivity"
                 android:label="@string/movie_view_label"
                 android:configChanges="orientation|keyboardHidden|screenSize">
@@ -62,14 +64,9 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="video/mpeg4" />
-                <data android:mimeType="video/mp4" />
-                <data android:mimeType="video/3gp" />
-                <data android:mimeType="video/3gpp" />
-                <data android:mimeType="video/3gpp2" />
-                <data android:mimeType="video/webm" />
-                <data android:mimeType="video/avi" />
+                <data android:mimeType="video/*" />
                 <data android:mimeType="application/sdp" />
+                <data android:mimeType="application/x-shockwave-flash" />
              </intent-filter>
              <intent-filter>
                 <!-- HTTP live support -->
@@ -135,13 +132,7 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="image/bmp" />
-                <data android:mimeType="image/jpeg" />
-                <data android:mimeType="image/gif" />
-                <data android:mimeType="image/png" />
-                <data android:mimeType="image/webp" />
-                <data android:mimeType="image/x-ms-bmp" />
-                <data android:mimeType="image/vnd.wap.wbmp" />
+                <data android:mimeType="image/*" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
             <intent-filter>
@@ -164,7 +155,6 @@
         <!-- This activity acts as a trampoline to the new Gallery activity,
              so that existing shortcuts are preserved. -->
         <activity android:name="com.android.gallery3d.app.Gallery"
-            android:excludeFromRecents="true"
             android:theme="@style/android:Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -192,7 +182,6 @@
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/android:Theme.NoDisplay" />
         <activity-alias android:name="com.android.camera.CameraLauncher"
-            android:enabled="true"
             android:label="@string/camera_label"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
@@ -282,11 +271,8 @@
             android:configChanges="keyboardHidden|orientation|screenSize">
            <intent-filter android:label="@string/crop_label">
                 <action android:name="com.android.camera.action.CROP" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:scheme="" />
                 <data android:mimeType="image/*" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.ALTERNATIVE" />