summaryrefslogtreecommitdiffstats
path: root/res/layout/photo_module.xml
Commit message (Collapse)AuthorAgeFilesLines
* snap: Fix preview overlaysSteve Kondik2016-11-181-18/+16
| | | | | | * Fix Z-order and touch focus Change-Id: I05891f6b6c1c5e9a0a9b1142c0613c08fb451bd1
* snap: UI checkpoint #2Steve Kondik2016-11-131-25/+34
| | | | | | | | | | * Fix bugs from previous commit * Factor out recording controls * Clean up layouts * Asynchronous control for video module * Performance improvements Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
* snap: Better capture animationSteve Kondik2016-11-131-7/+5
| | | | | | | * Modified version from Camera2 * Also adjust the callbacks for better response Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-11-021-17/+0
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* Drop new focus indicator into Camera2.Paul Rohde2016-11-021-0/+4
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* camera: Remove the luma-adaptation seekbarSteve Kondik2016-11-021-10/+0
| | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* SnapdragonCamera: Support rotation for image review layoutJay Wang2016-05-041-1/+1
| | | | | | | | | | 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: Fix auto HDR indication issueJay Wang2016-04-071-1/+1
| | | | | | | | 1. Fix the logic on validating the auto HDR detection. 2. Move teh HDR indicator to more visible area CRs-Fixed: 999660 Change-Id: I797f69edc847b94f60c637373b80278783c3dac8
* SnapdragonCamera: Adding help screen on first startJack Yoo2016-01-201-1/+3
| | | | | | | Adding menu help screen. Change-Id: I8f88a20b0c3599bfa35040e66562ced012d6213d CRs-Fixed: 951551
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2015-12-221-0/+1
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-07-281-0/+1
| | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* SnapdragonCamera: Fix DUT flash main menu when open camera.likaid2015-04-171-2/+1
| | | | | | | | | | When the process of opening camera, the background layout has no content which cause the main menu show. When open camera, make the background layout exist. Change-Id: If6075c652b6c9973d201cff1e537522c87c4f0ff CRs-Fixed: 822737
* SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-201-0/+6
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* SnapdragonCamera: Add Portrait to scene modeByunghun Jeon2015-01-261-42/+0
| | | | | | | Add portrait option to scene mode Change-Id: I5c29e896734eab25e8f21adb142006081ea1c851 CRs-Fixed: 777753
* SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-0/+4
| | | | | | | | 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: Use MDP composition instead of GPUByunghun Jeon2014-11-171-67/+66
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-0/+1
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-0/+6
| | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* Camera2: avoid histogram covering shutter button.Likai Ding2014-05-271-2/+2
| | | | | | | | Histogram covers shutter button when the phone is rotated 90 or 180 degrees. Move it a little nearer to the center. Change-Id: I85b187c95b9cf9ef680765042b9679a9e58577ee CRs-Fixed: 657271
* Camera2: Fix histogram cover the capture button issueliangche2014-03-271-1/+1
| | | | | | | | | The change increase the histogram layout marginLeft, then the histogram layout will not cover the capture button layout when camera in landscape mode. Crs-fixed: 622533 Change-Id: I58dc5518f6d96b759c352aea86e14b1acdccb1ea
* Camera: Set the width dynamic to parent from fixed 400pxSuman Mukherjee2013-12-121-1/+2
| | | | | | | | | | | Width of the seekbar was 400px and that caused overflow for the rightmost text value. Set the width match_parent so that it'll change dynmaically with the text window. Change-Id: I51069d4c5687e72516bc4a5afc59f9f3ae6f8e88 CRs-fixed: 582325
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+6
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | Camera2: Fix compilation issuesManish Kumar2013-10-311-2/+1
| | | | | | | | | | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* | Bring skin tone seekbar to front...Santhosh Kumar H E2013-10-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skin tone dialog was part of frame layout and render overlay was drawn on top of this. So render overlay was consuming all touch events. This change makes sure skin tone dialog receive touch events whenever it is visible. Change-Id: I1d01bcc101c2f9090f0f163397e86553f98b49ac Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java (cherry picked from commit 675a15daf9b9eef543386630dc65f3fa9dac498e) (cherry picked from commit ac2d0ab2b068576bf1adf05e4cef96aaf4c14be3)
* | Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* | Camera: Add histogram view to preview framelayoutSanthosh Kumar H E2013-10-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | Swipe in preview does not route user to Gallery, hence no need to handle this operation. Histogram graph view was added outside of preview frame layout and there was no container view outside this. So histogram was occupying complete screen. Change-Id: I94c9e7e76f4bc5d1efb568280ca5c41585224ff9 (cherry picked from commit ad3ece51bf6e3b14c2a5a068ce937b89b4578e24) (cherry picked from commit 348a7d8a67f06f3b6fbd999bc0b3ef81a364b5c1)
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-0/+61
|/ | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* Show captured image rather than frozen preview for capture intentDoris Liu2013-09-111-0/+8
| | | | | Bug: 10570887 Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
* Fix gap between camera controls and nav barDoris Liu2013-08-291-3/+9
| | | | | Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
* Fix camera preview stopped after onResume().Angus Kong2013-08-131-1/+1
| | | | | | | | | | | This fix is for the blank camera preview blank after onPause() -> onResume(). 1. Refined camera start up procedure by removing redundant camera startup thread. 2. Cleanup unused calls after aparted from gallery. bug:10189998 Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
* Add flash animation to photo moduleDoris Liu2013-06-191-0/+7
| | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* Switch over to use new camera activityDoris Liu2013-06-181-2/+7
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Flatten view hierarchy and rotate viewsDoris Liu2013-03-041-5/+15
| | | | | | | | | TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
* Copy camera resources into Gallery2Michael Kolb2013-01-291-0/+29
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 01:50:53 +0000