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 | e581721729f9a592562d499e95ab84229c934b76 (patch) | |
| tree | 642d967096b69b11d5df28f95715c4a6adbed285 /AndroidManifest.xml | |
| parent | 89d478788204c118329bc8e36cf961f8749a1a1d (diff) | |
| parent | 871ed9a6a857e013a7d3c3b07f6a1d69e998ea9b (diff) | |
| download | android_packages_apps_Snap-e581721729f9a592562d499e95ab84229c934b76.tar.gz android_packages_apps_Snap-e581721729f9a592562d499e95ab84229c934b76.tar.bz2 android_packages_apps_Snap-e581721729f9a592562d499e95ab84229c934b76.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" /> |