Combine ImageLoader and CropLoader utility classes.

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0cdaf99..68780f7 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40011"
-        android:versionName="1.1.40011"
+<manifest android:versionCode="40030"
+        android:versionName="1.1.40030"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 
@@ -74,7 +74,7 @@
                 <data android:mimeType="application/sdp" />
              </intent-filter>
              <intent-filter>
-                !-- HTTP live support -->
+                <!-- HTTP live support -->
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -283,20 +283,6 @@
         <activity android:name="com.android.gallery3d.gadget.WidgetTypeChooser"
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Gallery.Dialog"/>
-
-        <activity android:name="com.android.camera.NewCameraActivity"
-                android:taskAffinity="com.android.camera.NewCameraActivity"
-                android:theme="@style/Theme.Camera"
-                android:label="@string/camera_label"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="com.android.camera.CameraActivity"
                 android:taskAffinity="com.android.camera.CameraActivity"
                 android:label="@string/camera_label"