commit f37e1e9a9ce5aade5ccb1ad24b754bde29327716
author nicolasroard <nicolasroard@google.com> Thu Sep 27 12:20:11 2012 -0700
committer nicolasroard <nicolasroard@google.com> Thu Sep 27 12:21:35 2012 -0700
tree c45b032301cb25130b80c2f4e1bd8934e43187e6
parent 8f6dc9eab9feca563b08400a7ebd74fb5d0e3075

Add the intent filter to start the new editor
Set Gallery to identify as needing a largeHeap

bug:7246621

Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf9f461..9c857b6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,8 @@
             android:name="com.android.gallery3d.app.GalleryAppImpl"
             android:theme="@style/Theme.Gallery"
             android:logo="@mipmap/ic_launcher_gallery"
-            android:hardwareAccelerated="true">
+            android:hardwareAccelerated="true"
+            android:largeHeap="true">
         <uses-library android:name="com.google.android.media.effects" android:required="false" />
         <activity android:name="com.android.gallery3d.app.MovieActivity"
                 android:label="@string/movie_view_label"
@@ -223,6 +224,23 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name="com.android.gallery3d.filtershow.FilterShowActivity"
+            android:label="@string/title_activity_filter_show"
+             android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="action_nextgen_edit" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+        </activity>
+
         <uses-library android:name="com.google.android.media.effects"
                 android:required="false" />
 
@@ -375,20 +393,5 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".filtershow.FilterShowActivity"
-            android:label="@string/title_activity_filter_show"
-             android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="action_nextgen_edit" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-        </activity>
     </application>
 </manifest>