summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/photoeditor
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aospJean-Baptiste Queru2012-06-146-4/+53
|\ | | | | | | Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
| * Gallery2: Check privative effectsJorge Ruesga2012-06-146-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps. If gapps is not present, Gallery2 gets into a FC when click on this effects. This patch checks if the permission "com.google.android.media.effects" exists and hide this 2 effects if permission not exists Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists Patch 3: Make isPresent method from effect classes a static method Patch 4: Change actions classes for static calling to effects classes Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
* | Fix b/6590795 dejank photo effect sliderRuei-sung Lin2012-06-011-0/+7
| | | | | | | | Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
* | Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.Yuli Huang2012-05-033-24/+6
| | | | | | | | | | | | | | | | | | Simplify the dialog options to confirm if the user wants to discard unsaved edited photo, similar to MMS asking if the user wants to discard the unsent message. bug:6436477 Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
* | Fix 'Edit' and 'Crop' behaviors.Yuli Huang2012-05-021-0/+2
| | | | | | | | | | | | | | | | | | 1. Make Gallery show edited local photo after resuming, similar to how it shows cropped local photo after resuming. 2. Fix inconsistency between cropping local/PWA photo. bug:6168430 Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
* | Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.Yuli Huang2012-04-271-10/+17
| | | | | | | | | | | | | | | | 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
* | Save edited photo in the source photo directory if applicable.Yuli Huang2012-04-102-46/+63
| | | | | | | | | | bug:6168430 Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
* | Fix b/5974240: Sliders may not be responsive to touches.Yuli Huang2012-04-023-32/+36
| | | | | | | | | | | | Add padding around sliders to increase its touchable areas. Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
* | Simplify PhotoEditor code.Yuli Huang2012-03-134-57/+75
| | | | | | | | | | | | | | 1. Encapsulate spinner usages inside Toolbar. 2. Remove unnecessary static variable usages. Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
* | Fix b/5885342: Multiple PhotoEditor activities cause exceptions.Yuli Huang2012-03-074-49/+62
| | | | | | | | | | | | Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
* | Use FloatMath instead of Math.Chih-Chung Chang2012-02-111-6/+7
| | | | | | | | Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
* | Merge "Revert "Use FloatMath instead of Math.""Chih-Chung Chang2012-02-101-7/+6
|\ \
| * | Revert "Use FloatMath instead of Math."Chih-Chung Chang2012-02-101-7/+6
| | | | | | | | | This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
* | | Merge "Use FloatMath instead of Math."Chih-Chung Chang2012-02-101-6/+7
|\| |
| * | Use FloatMath instead of Math.Chih-Chung Chang2012-02-111-6/+7
| | | | | | | | | | | | Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
* | | Fix b/5974541: Support up to 45 degrees for straighten.Yuli Huang2012-02-091-1/+1
| | | | | | | | | | | | Change-Id: I131a478c59f5619e801311d9872440b2c7014578
* | | Fix b/5974663: inconsistent transparency of disabled action buttons.Yuli Huang2012-02-092-6/+42
|/ / | | | | | | | | | | | | | | | | 1. Avoid gray out save-button again as disabled alpha is already applied to all text buttons. 2. Reduce disabled alpha of image buttons to make them look consistent with text buttons. Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
* | Improve Doodle UI for ending Doodle effect.Yuli Huang2011-12-062-7/+32
| | | | | | | | | | | | | | | | As doodle-view was removed before the final doodle results are produced by MFF and displayed, doodles drawn disappeared temporarily when the user exits Doodle effect. Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
* | Fix effect-label layout and a TODO.Yuli Huang2011-12-0522-167/+160
| | | | | | | | | | | | | | | | 1. Seekbar was wrongly placed below effect label because of the added order. 2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit. Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
* | Simplify EffectAction.Yuli Huang2011-12-0313-51/+39
| | | | | | | | | | | | | | 1. Make the whole effect item clickable instead of just the icon. 2. Rename interfaces/methods to improve readability. Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
* | Remove unnecessary code.Yuli Huang2011-12-021-43/+6
| | | | | | | | | | | | | | Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done in MFF. Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
* | Refactor to remove obsolete design and improve code consistency.Yuli Huang2011-12-0250-500/+241
|/ | | | | | | | | | | | | 1. Remove isValid()/validate() in Filter; EffectAction would push filters into the stack when being notified by notifyChanged(). 2. Make RedEyeAction consistent with DoodleAction by ignoring out-of-bounds operations. 3. Improve consistency by encapsulate effect-tool creation/removal in one class (EffectToolFactory). 4. Minimize variable visibility in EffectAction subclasses. 5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch. Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
* Fix b/5517002 by dismissing running progress dialog in onPause().Yuli Huang2011-11-153-40/+44
| | | | Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
* Fix b/5518211 by disabling effects when photo cannot be loaded.Yuli Huang2011-11-103-30/+38
| | | | Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
* Fix b/5587210: Add file extension to display-name.Yuli Huang2011-11-101-1/+1
| | | | Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
* Fix b/5510870 by persisting states of save/share buttons.Yuli Huang2011-11-092-2/+9
| | | | Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
* Fix b/5510870 by saving/restoring Activity states.Yuli Huang2011-11-0941-248/+484
| | | | | | | 1. Filters implement Parcelable for saving/restoring states. 2. Extract Doodle for making doodling paths parcelable. Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
* Add face tanning effect to galleryRuei-sung Lin2011-11-042-0/+108
| | | | | | bug: 5453164 Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
* Fix b/5501285 by ensuring bitmap in ARGB8888 format.Yuli Huang2011-10-271-2/+9
| | | | Change-Id: I48ece547543207ba92276962fc6131859f615313
* Fix b/5401109.Yuli Huang2011-10-208-57/+338
| | | | | | | | | | 1. Add FlipView similar to existing RotateView. 2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and add setRenderToFlip() in RendererUtils. 3. Make FlipAction use FlipView/PhotoView similar to how RotateAction uses RotateView/PhotoView. Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
* Fix b/5403449.Yuli Huang2011-10-185-139/+270
| | | | | | | | | | 1. Extract code that recreates/restores ActionBar as RestorableView, and make both ActionBar and EffectsMenu extend RestorableView. 2. Fix effects-menu buttons too close to each other. 3. Remove effects-menu buttons' highlight animations to look more responsive. Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
* Fix UI.Yuli Huang2011-10-132-8/+12
| | | | | | | | | 1. Replace slider assets on tablets. 2. Add face-tan effect icon. 3. Change orange color to blue color in straighten effect to be consistent with crop effect. Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
* Fix b/5392171 and b/5389281.Yuli Huang2011-10-124-15/+15
| | | | | | | | | 1. Fix b/5392171 by moving effect context creation into Filter to make sure it'd be created when needed. 2. Revise the fix for b/5389281 by clearing surface background even there's no photo. Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
* Fix b/5433856 and b/5433907.Yuli Huang2011-10-104-30/+56
| | | | | | | | | | 1. Make PhotoView restore rotation after the device awakes or the orientation changes. 2. Avoid outputting top filter until the active effect requests its output to fix incorrect Crop/Rotate/Doodle effects after device awakes. 3. Speed up rotation speed by removing queued outdated rotation. Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
* Replace slider assets and fix save-share-button height.Yuli Huang2011-10-063-8/+5
| | | | | | | | 1. Use the same slider asset for both fill-light and highlights. 2. Update slider assets and dimensions. 3. Fix save-share-button height didn't fill action-bar. Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
* Fix b/5413887 and b/5389281.Yuli Huang2011-10-0528-116/+102
| | | | | | | | 1. Fix b/5413887 by releasing MFF effects as well as release MFF effect-context. 2. Fix b/5389281 by removing photoView.setPhoto(null). Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
* Fix b/5032231: Allow share in Photo Editor.Yuli Huang2011-10-052-5/+44
| | | | Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
* Fix b/5375999: replace effect thumbnails.Yuli Huang2011-10-041-1/+0
| | | | | | | | 1. Replace Doodle/Facelift thumbnails. 2. Adjust effect label margins. 3. Remove unused imports from FaceliftFilter.java. Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
* Fix b/5317371 to make action-bar consistent with framework CAB.Yuli Huang2011-10-048-345/+305
| | | | | | | | | | 1. Refactor to decouple ActionBar from FilterStackListener and ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar. 2. Recreate the action-bar on configuration changes and restore button status and behaviors from the old action-bar. 3. Use framework CAB styles/dimensions to have consistent look and feel. Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
* facelift in galleryRuei-sung Lin2011-09-302-0/+111
| | | | Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
* Change gallery crop interface to be consistent with widget resizingMichael Jurka2011-09-281-13/+11
| | | | | | | - Always show the resize controls when you're not touching the UI - Change the resize controls to the holo style Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
* Fix b/5287869 (and b/5369640).Yuli Huang2011-09-282-3/+8
| | | | | | | Images from some app (MMS) may not have columns that PhotoEditor tries to query, for example: the orientation. Just ignore the absent columns. Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
* parameter change to match apiRuei-sung Lin2011-09-205-10/+7
| | | | | | Cherry-pick to fix b/5339529. Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
* Update for compatibility with Effects API naming change.Marius Renn2011-09-141-1/+1
| | | | | | | | | Part of bugfix 5287103. NOTE: This will fix the build, but temporarily break the Doodle effect on the photo editor. Will check in fixes later. Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
* Fix b/5182741: Add 'Edit' title in the action-bar.Yuli Huang2011-09-141-0/+12
| | | | Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
* Fix b/4643148: Make PhotoEditor integrated into Gallery.Yuli Huang2011-09-1377-0/+6188
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