diff options
| author | John Hoford <hoford@google.com> | 2013-01-08 14:20:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-08 14:20:59 -0800 |
| commit | 534fc631c98d51b186b823608a0d9e267b3c0ea8 (patch) | |
| tree | 7e4f2816097f8439a5cda813f29e2e6fc59ce5da /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
| parent | a91969297aac4fa4572ad7c69d4d5924ce4b8de2 (diff) | |
| parent | 7b9803262e5f1ebb9464d5cf857f9cbb38f888bf (diff) | |
| download | android_packages_apps_Snap-534fc631c98d51b186b823608a0d9e267b3c0ea8.tar.gz android_packages_apps_Snap-534fc631c98d51b186b823608a0d9e267b3c0ea8.tar.bz2 android_packages_apps_Snap-534fc631c98d51b186b823608a0d9e267b3c0ea8.zip | |
Merge "Add a Draw filter" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index bc90a31ba..755bd8031 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -62,6 +62,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter; import com.android.gallery3d.filtershow.filters.ImageFilterContrast; import com.android.gallery3d.filtershow.filters.ImageFilterCurves; import com.android.gallery3d.filtershow.filters.ImageFilterDownsample; +import com.android.gallery3d.filtershow.filters.ImageFilterDraw; import com.android.gallery3d.filtershow.filters.ImageFilterEdge; import com.android.gallery3d.filtershow.filters.ImageFilterExposure; import com.android.gallery3d.filtershow.filters.ImageFilterFx; @@ -80,6 +81,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterVignette; import com.android.gallery3d.filtershow.filters.ImageFilterWBalance; import com.android.gallery3d.filtershow.imageshow.ImageBorder; import com.android.gallery3d.filtershow.imageshow.ImageCrop; +import com.android.gallery3d.filtershow.imageshow.ImageDraw; import com.android.gallery3d.filtershow.imageshow.ImageFlip; import com.android.gallery3d.filtershow.imageshow.ImageRedEyes; import com.android.gallery3d.filtershow.imageshow.ImageRotate; @@ -120,6 +122,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, private ImageCurves mImageCurves = null; private ImageBorder mImageBorders = null; private ImageRedEyes mImageRedEyes = null; + private ImageDraw mImageDraw = null; private ImageStraighten mImageStraighten = null; private ImageZoom mImageZoom = null; private ImageCrop mImageCrop = null; @@ -221,6 +224,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mImageFlip = (ImageFlip) findViewById(R.id.imageFlip); mImageTinyPlanet = (ImageTinyPlanet) findViewById(R.id.imageTinyPlanet); mImageRedEyes = (ImageRedEyes) findViewById(R.id.imageRedEyes); + mImageDraw = (ImageDraw) findViewById(R.id.imageDraw); mImageCrop.setAspectTextSize((int) getPixelsFromDip(18)); ImageCrop.setTouchTolerance((int) getPixelsFromDip(25)); @@ -280,6 +284,9 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mImageRedEyes.setImageLoader(mImageLoader); mImageRedEyes.setMaster(mImageShow); + mImageDraw.setImageLoader(mImageLoader); + mImageDraw.setMaster(mImageShow); + mPanelController.setActivity(this); mPanelController.addImageView(findViewById(R.id.imageShow)); @@ -292,6 +299,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mPanelController.addImageView(findViewById(R.id.imageZoom)); mPanelController.addImageView(findViewById(R.id.imageTinyPlanet)); mPanelController.addImageView(findViewById(R.id.imageRedEyes)); + mPanelController.addImageView(findViewById(R.id.imageDraw)); mPanelController.addPanel(mFxButton, mListFx, 0); mPanelController.addPanel(mBorderButton, mListBorders, 1); @@ -315,6 +323,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, new ImageFilterVibrance(), new ImageFilterSharpen(), new ImageFilterCurves(), + new ImageFilterDraw(), new ImageFilterHue(), new ImageFilterSaturated(), new ImageFilterBwFilter(), |