summaryrefslogtreecommitdiff
path: root/src/com/android/camera/ui/CameraControls.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Fix panorama layoutArne Coucheron2020-11-261-1/+1
| | | | | | Loosely based on old cyngn patches. Change-Id: I7fdb6ba82243f2f28e8ea655f83f0339d49de5ad
* Snap: Show remaining photos on initial startArne Coucheron2020-11-261-0/+1
| | | | | | Also increase margin a bit. Change-Id: Id8ddb1137094f03bd26b487575b555bbadd80432
* snap: Adjust top bar icon orderSteve Kondik2020-11-261-7/+7
| | | | Change-Id: I1fe55daca970a8e9a725718aa6a02618450ccbf6
* Remove unused menu indicators code.Danny Baumann2020-11-261-20/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Snap: Materializejrizzoli2020-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Thu Jan 7 21:07:51 2016 +0100 Snap: initial materialization Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Mon Jan 11 21:02:08 2016 +0100 Snap: remove captureUI pngdrawables CM now supports 90/270 degrees rotated vectordrawables Change-Id: I13b36463c60430564c00bd1e36393fff7ddbfdae Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Wed Jan 20 20:54:10 2016 +0100 Snap: update shutter button style Change-Id: Ide5fc0ff1c54e216ac7cd9bea202002d1d4dfa12 Author: Joey Rizzoli <joey@cyanogenmoditalia.it> Date: Sun Dec 11 21:30:18 2016 +0100 Snap: update caf icons Change-Id: I1adaf709253637bde037b5aea1f856fc5b9029c7 Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it> Author: Arne Coucheron <arco68@gmail.com> Date: Thu Aug 17 01:19:05 2017 +0200 Snap: Update HDR icons Current ones are so small, I can hardly see them. These new ones are bigger and looks more in line with the rest of the icons. Change-Id: Idaeec67a78d66105a375f09b6701a49dce43fd22 Author: codeworkx <daniel.hillenbrand@codeworkx.de> Date: Sat Jan 20 12:46:31 2018 +0100 Snap: update shutter buttons on CaptureUI Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95 Author: Paul Keith <javelinanddart@gmail.com> Date: Tue Jan 23 23:36:19 2018 +0100 Snap: Update pano and video icons to be more like photo icons * Put the colored ring on the _outside_ of the shutter * While we're at it, cleanup naming and usage of color resources Change-Id: I4f344fa272374d043f2b83dba7248e263fab8bf0 Author: Andreas Blaesius <andi@unlegacy-android.org> Date: Fri Jun 1 17:47:00 2018 +0200 Snap: remove unused shutter buttons Change-Id: Id913626bbccc6fd245ed9f46374389ca7eca3c30 Change-Id: I7596f3c887874b4913d87ecbfa5438191fc86249 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* SnapdragonCamera: Fix does`t support UbiFocus and HDR meanwhilemingwax2017-01-181-0/+2
| | | | | | | UbiFocus、Adwanced Features and HDR do mutal exclusion. CRs-Fixed: 1112930 Change-Id: I4eefa2a0acb5f0b59bb4c24ad9da041704823218
* SnapdragonCamera: Fix does`t support HDR and chromaflash meanwhilemingwax2017-01-121-2/+0
| | | | | | | Chroma Flash、 Adwanced Features and HDR do mutual exclusion. CRs-Fixed: 1107236 Change-Id: I7e9f94fb757693fd5df7391ef94f194af3dae65c
* SnapdragonCamera: Scene mode button was enabled when chroma flash was onweijiew2016-11-241-1/+0
| | | | | | | | Scene mode button should be disabled when chroma flash was on, but it was enabled when the animation of setting menu dismissing was end. Change-Id: I902ced210d410f07a3db5113be7dd922ea9be74c CRs-Fixed: 1089451
* SnapdragonCamera: Panorama ModuleJack Yoo2016-09-271-5/+31
| | | | | | | Introducing Panorama capture module for Camera2 Change-Id: I98306c6c88c34c58b99adf9d472418392015f6c5 CRs-Fixed: 1067848
* SnapdragonCamera: Fix the issue Color effect is confusionweijiew2016-07-271-5/+3
| | | | | | | | | Color effect display highlighting when scene mode set with non auto after switch rear/front camera.Set color effect display grey when scene mode set with non auto Change-Id: I2837de78ba0271a6b3acd25ca02aed9a63967328 CRs-Fixed: 1042257
* SnapdragonCamera: Add video to Camera2 moduleByunghun Jeon2016-06-291-3/+25
| | | | | | Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
* SnapdragonCamera: Support rotation for image review layoutJay Wang2016-05-041-8/+20
| | | | | | | | | | Currently, image review layout is fixed to portrait mode. Changing the resources to use RotateImageView and update the scaling function in RotateImageView to support both up and down scaling of the image CRs-Fixed: 1004669 Change-Id: I6940227c634b7654bce5de5efe032aaa8da80e72
* SnapdragonCamera: Hide remaining photo counterJay Wang2016-04-011-4/+11
| | | | | | | | | | | | Since the application that issues image capturing intent can specify own photo storage location, it doesn't make sense for SnapdragonCamera application showing the remaining photo counter based on its storage location. Therefore, make change to hide remaining photo counter when photo capturing requests is from an intent. Change-Id: I1d18d9365db8d4dc0060bc09b32e45a9370706b4 CRs-Fixed: 994963
* SnapdragonCamera: Disable HDR when AutoHDR is onCamera Software Integration2016-01-081-0/+6
| | | | | | | Hide HDR button when AutoHDR is on. Change-Id: Ic5482ae577c1991711c46d709af3108c1f0620b6 CRs-Fixed: 929738
* SnapdragonCamera: Preventing duplicated call of setEnableCamera Software Integration2016-01-061-2/+4
| | | | | | | Prevent it from calling twice on animation case. CRs-Fixed: 944874 Change-Id: I96468b627719d48bbd1fc857556dff8f27f46665
* SnapdragonCamera: Adjust remaining photos layoutCamera Software Integration2015-12-301-1/+8
| | | | | | | | There's a case exceeding the width. Correct the calculation to adjust it. Change-Id: I17553b471d4cf781b2532362c6dfc2c50dc5936b CRs-Fixed: 939587
* SnapdragonCamera: Introducing mute buttonCamera Software Integration2015-12-221-4/+28
| | | | | | | Introducing audio mute button on video recording Change-Id: I69ff6fe97c4b8d76a890b5e41667dab534d69ba8 CRs-Fixed: 937239
* SnapdragonCamera: Touch not working on camera after tapping on settings.likaid2015-09-161-0/+12
| | | | | | | | | When taking a picture in the 3rd app the settings of camera is displayed. It will unsupport setting when taking a picture from the 3rd app. Change-Id: I926bed3d4c4b1c373532dc89168ba82990269a6b CRs-Fixed:901020
* Merge "SnapdragonCamera: Stop the longshot when the storage is full"Linux Build Service Account2015-09-091-3/+15
|\
| * SnapdragonCamera: Stop the longshot when the storage is fulllikaid2015-09-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | The remainingPhotos was decreeased by 1 for each shot, when it came to 0, the longshot process was not stopped. When the remaining photos are less than 20, show "<20" for the remainingPhotos; When the storage is full, Stop the longshot process. Change-Id: Ifb1fb38f668132e1058f8a937afa9fa0b5afb5a7 CRs-Fixed: 893008
* | SnapdragonCamera: Hide camera controllers when review captured imagelikaid2015-09-081-0/+24
|/ | | | | | | | | | | | The camera settings options including scene mode, color effect, switcher for back/front camera, and the beautification make-up should only be shown on camera preview, since they are not used for editing pictures. Hide these camera setting options to avoid making user confused. Change-Id: I26599c4d97043069eee9c1a069325735ba625a94 CRs-Fixed: 895938
* SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-201-21/+102
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-7/+11
| | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-20/+22
| | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* Merge "SnapdragonCamera: New shutter Icons"Linux Build Service Account2015-01-231-4/+6
|\
| * SnapdragonCamera: New shutter IconsByunghun Jeon2015-01-201-4/+6
| | | | | | | | | | | | Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
* | SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-1/+105
|/ | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-3/+71
| | | | | | | | When preview is set to 4:3 on a 16:9 screen, resize SurfaceView to 4:3 and cover other parts of the screen. Otherwise camera controls have a semi-transparent background. Change-Id: Icfbe6318b6a9de9a988468078b474e842f6ddd8c
* SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-221-0/+51
| | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-48/+32
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Update UI with new icons and setting menusByunghun Jeon2014-11-171-1/+1
| | | | | | Updating icons and settings menus for SnapdragonCamera UI Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-103/+508
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Measure all children to ensure correct layout positionDoris Liu2013-08-301-0/+2
| | | | | Bug: 10412775 Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-5/+1
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Update camera orientation when device is flippedDoris Liu2013-06-131-85/+0
| | | | | Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
* Fix video capture intent overlapping buttonsDoris Liu2013-05-071-1/+1
| | | | | Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
* Fix review button placementMichael Kolb2013-05-071-53/+66
| | | | | | Bug: 8833788 Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
* Restrict checking for device flipDoris Liu2013-05-031-6/+19
| | | | | Bug: 8714114 Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
* Anchor camera controls when flipping deviceDoris Liu2013-05-031-18/+70
| | | | | | | | 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
* Align review controlsMichael Kolb2013-04-301-0/+9
| | | | | | Bug: 8753607 Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
* Fix indicator layoutMichael Kolb2013-04-291-1/+1
| | | | | | | | Bug: 8754592 Use the correct anchor for layout Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
* 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
* Improve black bar to keep camera controls in placeDoris Liu2013-04-031-0/+83
Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b