diff options
| author | Yuli Huang <yuli@google.com> | 2011-09-12 22:25:30 +0800 |
|---|---|---|
| committer | Yuli Huang <yuli@google.com> | 2011-09-13 00:36:00 +0800 |
| commit | 6a12ad70df5da5052a8381e2cdda79e6a314cee9 (patch) | |
| tree | 11a4d3a11c110af87e808b5a1845e41aefd5ac5a /AndroidManifest.xml | |
| parent | 2c704be3f593ece6ef5b96ff166f126f4afc9d23 (diff) | |
| download | android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.tar.gz android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.tar.bz2 android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.zip | |
Fix b/4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a5a64219d..5beb3bfbf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -192,6 +192,17 @@ <category android:name="android.intent.category.SELECTED_ALTERNATIVE" /> </intent-filter> </activity> + <activity android:name="com.android.gallery3d.photoeditor.PhotoEditor" + android:label="@string/photoeditor_name" + android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" + android:configChanges="keyboardHidden|orientation|screenSize" + android:hardwareAccelerated="true"> + <intent-filter> + <action android:name="android.intent.action.EDIT" /> + <data android:mimeType="image/*" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> <activity android:name="com.android.gallery3d.app.SlideshowDream" android:label="@string/slideshow_dream_name" |