summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Improve bitmap load efficiency.Angus Kong2013-05-143-356/+524
| | | | | | | | | | | | | | | | | | | | Call prepare before/recycle after using image data. Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
* | | | am 26dbb20c: Merge "Pause face detection when review captured images" into ↵Doris Liu2013-05-141-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | gb-ub-photos-bryce * commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc': Pause face detection when review captured images
| * / Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
| |/ | | | | | | | | Bug: 8799508 Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
* / Dropping back FilmStripView codes.Angus Kong2013-05-133-0/+1541
|/ | | | | | Ongoing work that doesn't affect builds. Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
* Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-091-0/+1
|\
| * Close menu in onPauseMichael Kolb2013-05-081-0/+1
| | | | | | | | | | | | Bug: 8722672 Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
* | Add drop shadow to preview thumbMichael Kolb2013-05-083-24/+19
|/ | | | | | | | Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
* Fix second level menuMichael Kolb2013-05-084-158/+102
| | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
* Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-084-2/+14
|\
| * Fix video capture intent overlapping buttonsDoris Liu2013-05-074-2/+14
| | | | | | | | | | Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
* | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
|/ | | | | | Bug: 8826233 Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
* Fix review button placementMichael Kolb2013-05-071-53/+66
| | | | | | Bug: 8833788 Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
* Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
| | | | | Bug: 8838983 Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
* Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\
| * Restrict checking for device flipDoris Liu2013-05-032-7/+20
| | | | | | | | | | Bug: 8714114 Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
* | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
| | | | | | | | | | | | Bug: 8826229 Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
* | Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
|/ | | | | Bug: 8804054 Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
* Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryceDoris Liu2013-05-032-68/+124
|\
| * Anchor camera controls when flipping deviceDoris Liu2013-05-032-68/+124
| | | | | | | | | | | | | | | | Also adjusted margins for camera root view to avoid covering undo bar Bug: 8758513 Bug: 8714114 Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
* | Don't show settings when popup is shown.Angus Kong2013-05-021-0/+1
|/ | | | | bug:8771618 Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
* Fix layout and preview for tabletsMichael Kolb2013-05-011-9/+25
| | | | | | | | Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
* Update capture animationMichael Kolb2013-05-014-3/+46
| | | | | | | | | Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
* Update location indicator correctlyMichael Kolb2013-04-303-11/+10
| | | | | | Bug: 8768592 Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
* Adjust switcher animationMichael Kolb2013-04-301-11/+27
| | | | | | Bug: 8754841 Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
* Align review controlsMichael Kolb2013-04-301-0/+9
| | | | | | Bug: 8753607 Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
* Remove empty slots from menuMichael Kolb2013-04-305-125/+94
| | | | | | | | | Bug: 8640131 When a specific camera doesn't support one of the menu options, the option is removed from the menu, no empty spot anymore. Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
* Remove timer indicatorMichael Kolb2013-04-291-6/+0
| | | | | | Bug: 8754833 Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
* Fix indicator layoutMichael Kolb2013-04-291-1/+1
| | | | | | | | Bug: 8754592 Use the correct anchor for layout Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
* Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryceAngus Kong2013-04-261-9/+14
|\
| * Delegate the texture copy to DrawClient.Angus Kong2013-04-261-9/+14
| | | | | | | | | | bug:8109314 Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
* | Add new indicatorsMichael Kolb2013-04-265-28/+70
|/ | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
* Merge "Center Video menu" into gb-ub-photos-bryceMichael Kolb2013-04-261-4/+4
|\
| * Center Video menuMichael Kolb2013-04-261-4/+4
| | | | | | | | | | | | Bug: 8660834 Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c
* | Merge "Don't render label on focus ring" into gb-ub-photos-bryceMichael Kolb2013-04-261-0/+4
|\ \
| * | Don't render label on focus ringMichael Kolb2013-04-261-0/+4
| |/ | | | | | | | | | | Bug: 8719036 Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
* | Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryceDoris Liu2013-04-2614-8629/+1
|\ \
| * | Remove new camera activity code from BryceDoris Liu2013-04-2514-8629/+1
| |/ | | | | | | | | Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
* / Make sure the initial rotation is setDoris Liu2013-04-251-1/+1
|/ | | | | Bug: 8718884 Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
* Avoid rendering underneath nav barDoris Liu2013-04-241-7/+32
| | | | | | Bug: 8647833 Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
* Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-246-25/+194
|\
| * New capture animationMichael Kolb2013-04-246-25/+194
| | | | | | | | | | | | | | | | | | Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
* | Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-243-6/+11
|\ \ | |/ |/|
| * Fix for popuping being hard to dismissDoris Liu2013-04-233-6/+11
| | | | | | | | | | Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
* | Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryceMichael Kolb2013-04-241-0/+3
|\ \
| * | Reset ongoing animation when opening menuMichael Kolb2013-04-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8687199 The XFade animation was not reset and yielded a transparent alpha Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
* | | Store location for SRI panoramas.Sascha Haeberling2013-04-241-2/+25
|/ / | | | | | | | | | | Bug: 8692005 Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
* | Fixes video mode indicators by resetting them on init.Sascha Haeberling2013-04-232-20/+7
| | | | | | | | | | | | Bug: 8696004 Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
* | Refactor the methods for changing the on-screen indicators.Sascha Haeberling2013-04-222-89/+177
|/ | | | | | | | | Bug: 8609355 This will be used in PanoramaModule to set the indicators to their default values when the module is initialized. Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6
* Merge "More menu fixes" into gb-ub-photos-bryceMichael Kolb2013-04-222-8/+29
|\
| * More menu fixesMichael Kolb2013-04-222-8/+29
| | | | | | | | | | | | | | | | | | Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7