summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/widget
Commit message (Collapse)AuthorAgeFilesLines
* Fix view recycling in filmstripAlan Newberger2015-04-091-17/+23
| | | | | | | | | | | | | View recycling is pretty broken, with code put in for the old camera preview in filmstrip being used to avoid recycling in all cases. This looks like its been broken in a number of releases, but less so due to a destructive removal of views during updates. I had fixed that but it then exposed the issue that recycling wasn't occurring elsewhere. This CL removes views from hierarchy, confirmed no more leaks when capturing and when swiping through filmstrip. Bug: 19970885 Change-Id: Ic63b9231bd24db0f44a99567278886eb0998d740
* Sync Video torch setting with on-screen indicatorSpike Sprague2015-03-261-2/+4
| | | | | bug: 19954583 Change-Id: Ia491b63f31d81038ca8d8841b1f72f5ee76bb64f
* Limit setting photo item placeholders when session is done.Alan Newberger2015-03-091-119/+24
| | | | | | | | | | | | | | | Only add placeholders for an item visible in the filmstrip. If a session is done for an item not visible, it is less janky for the user to see the standard gray placeholder while loading the image from disk. Pruned older methods of determining filmstrip visibility, none of which worked and relied on older code assuming the camera preview was an item in the filmstrip, including 'sticky' filmstrip item bits. Added a method to CameraAppUI that proxies the FilmstripLayout visibility, which is actually what app uses to show/hide the filmstrip. Bug: 19517380 Change-Id: I5e2a61b55aa2045bfd09f495dd02cdcb9c65dc68
* Remove video portrait orientation promptAlan Newberger2015-03-091-250/+0
| | | | | | | No longer display visual reminder for users to rotate device to landscape. Bug: 19416311 Change-Id: Ia03f54809f64e6034479a9021c87b50f186bab99
* Switch round thumbnail to respond immedatly to thumbnails.Paul Rohde2015-03-061-147/+134
| | | | | | | | | Previous version queued thumbnail requests and would wait to show thumbnails until the animations completed. Bug: 19606612 Change-Id: I6c9ab8946ba39d6ac53476bf493829647b415cba
* Merge "Fix rotation problem with the capture indicator." into ↵Paul Rohde2015-03-051-8/+17
|\ | | | | | | ub-camera-haleakala
| * Fix rotation problem with the capture indicator.Paul Rohde2015-03-051-8/+17
| | | | | | | | | | | | | | | | This addresses a tiny problem where taking a new picture after rotating the device causes the indicator to temporarily rotate. Bug: 19479623 Change-Id: I567edba32ff7e776ef7605e993db09007b956acd
* | Fixing comment syntax for RoundedThumbnailView.Sascha Haeberling2015-03-051-53/+65
|/ | | | Change-Id: I167489672f0df4d9bd0f7ccc194a8c50608d5c5f
* Cache Paint objects for capture animation rendering.Paul Rohde2015-03-051-34/+55
| | | | | | | | | This should help reduce the draw times for the thumbnail view by reducing object allocation and reusing the same paint objects. Bug: 19424945 Change-Id: Ia38a65dec4477f100a27543312b736c10ec07e40
* Remove CanSwipeInFullScreen attribute.Paul Rohde2015-02-191-12/+5
| | | | | | | | | | This fixes the swipe guesture problem by removing the mostly unused canSwipeInFullScreen attribute on filmstrip items and checking existing usages to ensure they still work. Bug: 18948437 Change-Id: I7d8c9fba4b0cf3db6fc3d60afe37d527c0732318
* Lock opacity of filmstrip items at 100% when scaling.Paul Rohde2015-02-191-5/+34
| | | | | Bug: 19252309 Change-Id: Ia82714649e7fac7b1cce2adc21c36832e055f9f6
* Enable exposure compensation in CaptureModule.Senpo Hu2015-02-172-9/+9
| | | | | | | | * Expose camera exposure compensation capabilities in OneCameraCharacteristics. * Turn off exposure compensation on Nexus 6 (API level 21). Bug: 18523154 Change-Id: I551f19945f5a64a09a76b3a0777664d16a9b2ba2
* Remove flicker from view items added to hierarchy as visibleAlan Newberger2015-02-131-1/+5
| | | | | | | | | | | | | With view items made visible right when added to hierarchy, under certain use cases the view would then get drawn before layout puts them offscreen and turns visibility off again. One example is delete -- once a deletion drag finishes, a view is added to the end of the 5-item array set to visible, and when dragging would briefly get shown. This CL ensures views only become visible when properly positioned. Bug: 17905863 Change-Id: I860dbee421f5bf6acb3cd9f5c09e4130eb9bc3c9
* gray cleanup to 1b1b1bAlan Newberger2015-02-061-1/+1
| | | | | | | | | | During Material update, filmstrip background was intentionally made 1b1b1b. Capture button and mode covers were slightly off from a previous gray design. Unifying all to one color constant. There are other, unused background specified from older times, removing them as part of cleanup. Confirmed with UX that all these colors should be 1b1b1b. Change-Id: I3da07e9828546d2c9d30a8ac756a0bbb89d6376c
* in secure camera, prevent swiping to filmstrip when no photo has been taken.Spike Sprague2015-02-051-1/+8
| | | | | bug: 19279388 Change-Id: I92c23dd5546aa31166df2ce40d19e374808d83d3
* Merge "Remove elevations from filmstrip" into ub-camera-haleakalaAlan Newberger2015-02-051-10/+1
|\
| * Remove elevations from filmstripAlan Newberger2015-02-041-10/+1
| | | | | | | | | | | | | | | | | | Elevations were not applied to SessionItems causing bad z-order behavior. As the shadows are not really visible, just removing elevation entirely, this also seems to improve performance. Bug: 17742801 Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40
* | Merge "Adjust capture indicator position while open/close mode options." ↵Senpo Hu2015-02-053-53/+91
|\ \ | |/ |/| | | into ub-camera-haleakala
| * Adjust capture indicator position while open/close mode options.Senpo Hu2015-02-043-52/+90
| | | | | | | | | | | | | | | | | | | | This CL also fixes the layout issue in landscape mode when mode option indicators are visible. Bug: 18866551 Bug: 18317565 Bug: 18905659 Change-Id: I34ca5aa77aa9d37a7f0ad3d2d7efbed92fe94f2b
* | Merge "Fix filmstrip jank on N4." into ub-camera-haleakalaPaul Rohde2015-02-041-92/+75
|\ \
| * | Fix filmstrip jank on N4.Paul Rohde2015-02-041-92/+75
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 19164291 Bug: 19220382 Bug: 19020507 Change-Id: Id1c2011b29b1cee206593fb395d9b4a4c89e71ab
* | | minor comment fix.Spike Sprague2015-02-041-0/+1
| | | | | | | | | | | | Change-Id: I284a6b4485dd972faef725cd7fd598afc9b83378
* | | Fix for CL ag/627135Spike Sprague2015-02-041-2/+12
|/ / | | | | | | | | | | | | Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling. Limit fling handling to entering Filmstip from the Preview. bug: 18904319 Change-Id: I51960dbb427345eb69a2d4a4a84d74479361be96
* | Merge "Revert "Move logic to open filmstrip from onUp() to onFling(), ↵Alan Newberger2015-02-041-12/+2
|\ \ | | | | | | | | | mimicking logic in ModeListView fling handling."" into ub-camera-haleakala
| * | Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking ↵Alan Newberger2015-02-041-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | logic in ModeListView fling handling." This reverts commit e3fd993f9e85acc7963673ee338ed4f1ba5dacbc. Change-Id: Idd51a11192640f9f20699b754b121262b3f51cc3
* | | Merge "Ensure right non-neighbors are invisible during filmstrip item ↵Alan Newberger2015-02-041-2/+10
|\ \ \ | | | | | | | | | | | | scaling" into ub-camera-haleakala
| * | | Ensure right non-neighbors are invisible during filmstrip item scalingAlan Newberger2015-01-301-2/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Only the immediate right hand neighbor should fade out and translate to center when drag-scaling the centered filmstrip item. Regression from G to H, this CL ensures only the immediate neighbor is visible. Bug: 19127110 Change-Id: I4023b91c384abd2b139b04124167cce8cb50c618
* | | Fix for Capture Indicator Animation ListenersI-Jong Lin2015-02-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue arose when Capture Indicator was hidden from the screen, and animations were NOT finished. Current listeners were unregistered, but never re-registered when capture indicator was shown again. Simplest solution is to null out the references to the animators in the RoundThumbnailView to signal animators to be re-created. Bug: 19034435 Change-Id: I94b74c0ea8f385d348dd981ebe8d9402140c3248
* | | Merge "Move logic to open filmstrip from onUp() to onFling(), mimicking ↵Spike Sprague2015-02-031-2/+12
|\ \ \ | |/ / |/| / | |/ logic in ModeListView fling handling." into ub-camera-haleakala
| * Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ↵Spike Sprague2015-02-021-2/+12
| | | | | | | | | | | | | | ModeListView fling handling. bug: 18904319 Change-Id: I8e2b1db72eceab1b5ba14f3ecf3aa35ba35df046
* | Trigger hit state animation when clicking on capture indicator.Senpo Hu2015-01-291-10/+103
|/ | | | | Bug: 18905659 Change-Id: I78131ded35e7663e159ec378a50603fa4cc23434
* Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakalaSenpo Hu2015-01-241-29/+44
|\
| * Fix NPE crash in RoundedThumbnailView.Senpo Hu2015-01-231-29/+44
| | | | | | | | | | Bug: 19003975 Change-Id: I4839696e1f5c4e9b7a768ed24ad5951764cd9d66
* | Fix Video thumbnail filmstrip sizeAlan Newberger2015-01-231-16/+16
|/ | | | | | | | | | | | Video size comes in asynchronously, and after refactor wasn't wired up to query the metadata instead of the initial mediastore size. This CL hides FilmstripItemData dimensions behind FilmstripItem so that VideoItem can override and provide a Size via its existing methods that use metadata if present. Bug: 19000322 Change-Id: Ifddd6c90169c80d9fd69a1549e1086d5f1abfd85
* Reduce view add/removes when loading photosAlan Newberger2015-01-221-10/+25
| | | | | | | | | | | | | | | | | | | | Two fixes to reduce flicker when loading images. First, adjust ViewItem instances in-place instead of creating new ViewItems which included adding and removing views from the hierarchy. It turned out we were doing an update for every photo due to touching PanoramaMetadata and reporting back that metadata was adjusted, whether or not a photo was a panorama. Now that data is reported. New photo captures are essentially added and removed from the view hierarchy three times before this change, after an ImageView is added once, with its contents changed as the photo is loaded. More testing is needed but I cannot repro the elusive filmstrip flicker with these changes. Bug: 18977838 Bug: 17905863 Change-Id: I5a42c0baf87a8cef0ee4dbcf9f03d40715e6aa2d
* Make it possible for singletons that rely on application context to bePaul Rohde2015-01-211-1/+1
| | | | | | | | | | | initalized lazily. * Add AndroidContext * Add AndroidServices * Make LogHelper ues thread safe lazy initialization * Convert several unused fields into local variables in CameraApp. Change-Id: I9c73e9b91efb49a01d848a8cca1e8e65f059b5d0
* Check filmstrip scroll controller as well when deciding to load the full ↵Paul Rohde2015-01-141-2/+6
| | | | | | | | resolution image. b/18947934 Change-Id: I6e9558bbd8a9b5ae52207cbb9af3b575123eda1f
* Load full resolution images for newly inserted images.Paul Rohde2015-01-141-28/+33
| | | | | | | | - Update log messages to remove filmstrip log spam. b/18947934 Change-Id: I7ee26e45ab2991ada148ce52d04899fc1d164784
* Merge "Refactor the filmstrip backing data." into ub-camera-haleakalaPaul Rohde2015-01-082-457/+527
|\
| * Refactor the filmstrip backing data.Paul Rohde2015-01-072-457/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused fields and code. - Rename classes and methods to be consistent with usage - Make data more immutable - Add Location and Metadata classes for typed data access. - Use Date instead of long for DateTime representations. - Filmstrip prefix for filmstrip specific code. - Cleaner Glide implementations. - Initialize Glide bitmap pool. - Eagerly load large image sizes when scroll stops. Change-Id: I3b51d42416ca076c80bf7db441d257659174b47d
* | Merge "Image Plane Proxy for Image Content Testability" into ub-camera-haleakalaI-Jong Lin2015-01-071-1/+1
|\ \ | |/ |/|
| * Image Plane Proxy for Image Content TestabilityI-Jong Lin2015-01-071-1/+1
| | | | | | | | | | | | | | | | Adds in an Image Plane wrapper level so that image content can be decoupled from the native Android Image objects whose constructors are privated and cannot be extended. Change-Id: Ia16418d18010e672f6c3e5db64bb7f6a9b3b2f3e
* | Merge "Avoid using fast_out_slow_in on K devices." into ub-camera-haleakalaSenpo Hu2015-01-071-2/+11
|\ \
| * | Avoid using fast_out_slow_in on K devices.Senpo Hu2015-01-051-2/+11
| |/ | | | | | | | | Bug: 18895268 Change-Id: I9bcd799c5a27b2e05cf45bb5923dcf8e7d0f7123
* / Fix NPE crash in RoundedThumbnailView.Senpo Hu2015-01-071-3/+6
|/ | | | | Bug: 18851937 Change-Id: I63f3084cd2ae7cd8bbb73507aefcf4192ed7bfd0
* Fix NPE crash in RoundedThumbnailView.Senpo Hu2014-12-221-0/+2
| | | | | Bug: 18835171 Change-Id: Ib77e15cfeb93e3d73cf14e2459dfcdbe54d92073
* Merge "Tune open filmstrip animation for capture indicator in Haleakala." ↵Senpo Hu2014-12-191-1/+4
|\ | | | | | | into ub-camera-haleakala
| * Tune open filmstrip animation for capture indicator in Haleakala.Senpo Hu2014-12-181-1/+4
| | | | | | | | | | | | | | Confirmed with zray@. UX team wants a smoother animation with fast_out_slow_in interpolator to open filmstrip. Change-Id: I8c7b82cf22f43df24bb27280364b2aacc97e46b3
* | CaptureModule first run dialog.Senpo Hu2014-12-183-142/+103
| | | | | | | | | | | | | | | | | | | | | | * Introduce FirstRunDialog. * Add OneCameraCharacteristics so we can query camera properties without opening the camera. * Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up. * Refactor to move away from portability/Size class in Camera2. Bug: 18623223 Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
* | Delete unused code.Paul Rohde2014-12-181-2/+1
| | | | | | | | Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31