summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
Commit message (Collapse)AuthorAgeFilesLines
* Fix second level menuMichael Kolb2013-05-081-50/+42
| | | | | | | | 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-081-1/+1
|\
| * Fix video capture intent overlapping buttonsDoris Liu2013-05-071-1/+1
| | | | | | | | | | 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
* 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
* 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-011-1/+11
| | | | | | | | | Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
* 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-302-43/+32
| | | | | | | | | 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
* Fix indicator layoutMichael Kolb2013-04-291-1/+1
| | | | | | | | Bug: 8754592 Use the correct anchor for layout Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
* 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-264-1036/+1
|\ \
| * | Remove new camera activity code from BryceDoris Liu2013-04-254-1036/+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
* New capture animationMichael Kolb2013-04-241-3/+154
| | | | | | | | | Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
* 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
* Merge "More menu fixes" into gb-ub-photos-bryceMichael Kolb2013-04-221-5/+6
|\
| * More menu fixesMichael Kolb2013-04-221-5/+6
| | | | | | | | | | | | | | | | | | Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
* | Fix camera buttons showing up at wrong positionDoris Liu2013-04-201-3/+27
|/ | | | | Bug: 8607034 Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
* Angle menu at edge of screenMichael Kolb2013-04-151-6/+34
| | | | | | | | Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
* Add menu labelsMichael Kolb2013-04-152-1/+29
| | | | | | Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
* Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryceMichael Kolb2013-04-121-1/+1
|\
| * Fix NPE in PieRendererMichael Kolb2013-04-121-1/+1
| | | | | | | | | | | | Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
* | Integrate FilmStripView.Angus Kong2013-04-112-13/+105
| | | | | | | | Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
* | Refactor CameraDataAdapter for other data types.Angus Kong2013-04-091-1/+0
|/ | | | Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
* Merge "Add more gestures and animations in FilmStripView." into ↵Angus Kong2013-04-092-113/+537
|\ | | | | | | gb-ub-photos-bryce
| * Add more gestures and animations in FilmStripView.Angus Kong2013-04-082-113/+537
| | | | | | | | | | | | Now supports fullscreen mode and filmstrip mode. Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
* | Work in progress - Put preview in TextureViewDoris Liu2013-04-093-4/+147
|/ | | | | | | | | | | Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
* Merge "Adjust camera menu further" into gb-ub-photos-bryceMichael Kolb2013-04-032-129/+111
|\
| * Adjust camera menu furtherMichael Kolb2013-04-032-129/+111
| | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
* | Improve black bar to keep camera controls in placeDoris Liu2013-04-033-20/+155
|/ | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
* Pie design updateMichael Kolb2013-04-012-97/+211
| | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
* Workaround for switcher popup being cut off on ICSDoris Liu2013-03-271-0/+2
| | | | | Bug: 8390375 Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
* Adding switcher background back inDoris Liu2013-03-251-0/+64
| | | | | | | Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
* Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryceAngus Kong2013-03-131-0/+421
|\
| * Horizontal scrollable filmstrip view.Angus Kong2013-03-131-0/+421
| | | | | | | | Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
* | Add coarse grained events for camera mode, filmstrip statsBobby Georgescu2013-03-131-0/+1
| | | | | | | | Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
* | Usage statistics collection for camera module, filmstripBobby Georgescu2013-03-121-0/+3
|/ | | | Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
* Fix camera switcher mode pickerDoris Liu2013-03-061-4/+8
| | | | | Bug: 8330008 Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
* Fix NPE in switcher popupDoris Liu2013-03-061-2/+2
| | | | | Bug: 8327966 Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
* Keep camera controls on the same physical sideDoris Liu2013-03-052-6/+49
| | | | Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a