summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2016-02-172-0/+36
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* De-uglify menu.Danny Baumann2016-02-159-34/+8
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* Snap: Material toastsMichael Bestas2016-02-101-3/+4
| | | | | | * Match the framework toast appearance Change-Id: I886862f3087bcd5cb1cfa76f72731292b7511d07
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-01-201-17/+0
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* Remove unused menu indicators code.Danny Baumann2016-01-202-114/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Drop new focus indicator into Camera2.Paul Rohde2016-01-152-0/+8
| | | | | | | * 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
* CameraActivity: Don't hide navigation barDanny Baumann2016-01-152-1/+3
| | | | | | * Make it transparent instead. Change-Id: I08b06ac72d88aaf62ae7f52a3dde9ba865bc3542
* Snap: initial materializationjrizzoli2016-01-0910-19/+13
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Snap: Remove CAF beautification featureMichael Bestas2015-09-205-270/+0
| | | | | | | | | | | | Revert "SnapdragonCamera: Move the files to the correct location" This reverts commit c25b2d510285512dbb60547353190433f1dbb984. Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera." This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088. Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87
* camera: Remove the luma-adaptation seekbarSteve Kondik2015-09-171-10/+0
| | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branchLinux Build Service Account2015-08-062-0/+2
|\ | | | | | | Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
| * SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-032-0/+2
| | | | | | | | | | | | | | 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-05-161-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
* Merge "SnapdragonCamera: Change the text shadow color on camera sub menu"Linux Build Service Account2015-04-021-1/+1
|\
| * SnapdragonCamera: Change the text shadow color on camera sub menulikaid2015-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | The text shadow color was shown out of menu range when the entry name was long. Change the shadow color to transparent to avoid this issue. Change-Id: I88c482d3c9a94b6f180326e43b5e5096026dd97a CRs-Fixed: 801018
* | Merge "SnapdragonCamera: The alert dialog's rotation is not right"Linux Build Service Account2015-03-261-0/+73
|\ \
| * | SnapdragonCamera: The alert dialog's rotation is not rightlikaid2015-03-111-0/+73
| |/ | | | | | | | | | | | | | | | | | | | | It will pop up a alert dialog if something goes wrong while generating mosaic. The alert dialog's rotation is not right, as a result, the alert dialog's UI will gose wrong. Use RotateLayout to set the rotation before we show the alert. Change-Id: Iaa91e811393a90c9f28f98404d782d2cc2ad9fe9 CRs-Fixed: 805471
* | SnapdragonCamera: Move the files to the correct locationJay Wang2015-03-234-0/+264
| | | | | | | | Change-Id: Id2d94a3be141a068f8a5e8ba461901b07700b7cb
* | SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-231-0/+6
|/ | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* Snapdragon: Fix orientation of Prepare panorama dialogByunghun Jeon2015-02-251-0/+29
| | | | | | | Put Prepare panorama dialog to proper orientation instead of fixed to portrait Change-Id: I0f3bc9bcd5a5e30566c37b1e7beac9df73af7e61
* SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-55/+64
| | | | | | | | | 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-024-28/+34
| | | | | | | | | | | | 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
* SnapdragonCamera: Add Portrait to scene modeByunghun Jeon2015-01-261-42/+0
| | | | | | | Add portrait option to scene mode Change-Id: I5c29e896734eab25e8f21adb142006081ea1c851 CRs-Fixed: 777753
* SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+68
| | | | | | | | 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
* Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Jay Wang2015-01-131-23/+81
| | | | This reverts commit 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.
* 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
* Merge "SnapdragonCamera: Fix menu is covered when count down take picture"Linux Build Service Account2015-01-061-4/+4
|\
| * SnapdragonCamera: Fix menu is covered when count down take pictureJing (Mia) Wang2014-12-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | The textview of count down title layout is unreasonable, which lead to some view is covered by text. Modify the layout params of textview. CRs-Fixed: 773384 Change-Id: I4c6cd67dcc275730de1ad61396a86f3d7250b90b
* | SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-01-051-81/+23
|/ | | | | | | | | | | | 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 Change-Id: I98735dbed2ff4dada8708bf5a4a0f9da6ba030c7 Conflicts: res/layout-land/pano_preview_progress.xml res/layout-port/pano_preview_progress.xml
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-172-110/+109
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Update UI with new icons and setting menusByunghun Jeon2014-11-172-8/+8
| | | | | | Updating icons and settings menus for SnapdragonCamera UI Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-179-0/+404
| | | | | | 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
* Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-211-3/+18
| | | | | | | | | - Added pause button in camcorder app.so that user pause recording and resume later which results in a single recorded clip. CRs-Fixed: 587051 Change-Id: I2a7d8af7fcea74fe8af62c44119c3c1fa0c13e85
* 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-065-0/+49
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix the RTL layout in the app's manifest.ztenghui2013-11-051-0/+2
| | | | | | | | | | | | | | At the same time, make sure the bottom controls are following RTL rules. bug:11481090 Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d
| * gcam: Add placeholder image.Ruben Brunk2013-10-281-0/+29
| | | | | | | | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
| * Show a preview cover until real preview is readyDoris Liu2013-10-153-0/+18
| | | | | | | | | | 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)
* Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-141-3/+2
| | | | | | | | | Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
* Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
| | | | | | | | | | | | | There are situations where the user selected options e.g. hdr+ are the initial indicators to the camera, so showing autoflash on the fake layout seems janky. additionally I sometimes see camera showing its own default clean circle indicator layout prior to switching to whatever indicators are active. For both these reasons it seems better to start secure camera from lockscreen with an empty circle indicator. I tried this CL out on my device and can confirm it feels less janky. Bug: 11206325 Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
* Workaround to disable swiping for SRI during captureDoris Liu2013-10-091-0/+1
| | | | | Bug: 11139101 Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de
* Make space for photosphere rendering textErin Dahlgren2013-10-031-1/+0
| | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 11:31:18 +0000