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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b372a8d0..2aea5699c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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">
@@ -164,7 +166,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 +193,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 +282,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" />