diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-09-27 12:20:11 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-09-27 12:21:35 -0700 |
| commit | b4f1161da4662e6374238b7b749e7a3a4122eccd (patch) | |
| tree | 6e6dace9712ae2bd3b3cdde42e2dde6fd8aa5ea4 /AndroidManifest.xml | |
| parent | a21fca7316757b9e311a6fbcd82f1cf54e45e3fa (diff) | |
| download | android_packages_apps_Snap-b4f1161da4662e6374238b7b749e7a3a4122eccd.tar.gz android_packages_apps_Snap-b4f1161da4662e6374238b7b749e7a3a4122eccd.tar.bz2 android_packages_apps_Snap-b4f1161da4662e6374238b7b749e7a3a4122eccd.zip | |
Add the intent filter to start the new editor
Set Gallery to identify as needing a largeHeap
bug:7246621
Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cf9f46134..9c857b6a3 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> |