diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-09 22:59:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-09 22:59:08 +0000 |
| commit | dcd1dd986bc8455ce822e8d9e7a46ea103228351 (patch) | |
| tree | 9ac57c011b76ef1d538d89e74b5382d190fe097a /AndroidManifest.xml | |
| parent | 355eaea088a348c394909fea6c9f812ff25e87ac (diff) | |
| parent | 6fe165b7d28299d5b2f97deb135b233d84eb300f (diff) | |
| download | android_packages_apps_Gallery2-dcd1dd986bc8455ce822e8d9e7a46ea103228351.tar.gz android_packages_apps_Gallery2-dcd1dd986bc8455ce822e8d9e7a46ea103228351.tar.bz2 android_packages_apps_Gallery2-dcd1dd986bc8455ce822e8d9e7a46ea103228351.zip | |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f736d7951..87c7b8031 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -246,7 +246,14 @@ <category android:name="android.intent.category.DEFAULT" /> <data android:mimeType="image/*" /> </intent-filter> - <intent-filter android:label="@string/crop_label"> + </activity> + + <activity + android:name="com.android.gallery3d.filtershow.crop.CropActivity" + android:label="@string/crop" + android:theme="@style/Theme.FilterShow" + 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" /> |