summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fix SRI UX issues and improve UI efficiencyDoris Liu2013-09-242-0/+169
| | | | | Bug: 10674078 Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
* Add crop activitynicolasroard2013-09-192-0/+79
| | | | | | bug:10367125 Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
* Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-121-0/+73
| | | | | | | | | Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
* Show captured image rather than frozen preview for capture intentDoris Liu2013-09-111-0/+8
| | | | | Bug: 10570887 Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
* Bring back wide angle panorama.Angus Kong2013-09-041-0/+26
| | | | | | bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
* Rename renering message from panorama to photo sphere.Sascha Haeberling2013-08-301-3/+2
| | | | | | Bug: 7695145 Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
* Fix gap between camera controls and nav barDoris Liu2013-08-292-6/+18
| | | | | Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
* Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbadAngus Kong2013-08-233-37/+81
|\
| * Bring back undo delete confirmation.Angus Kong2013-08-233-37/+81
| | | | | | | | | | | | | | | | | | Also corrects the default decoding size. bug:10413110 bug:10330214 Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
* | Proper I18N of the Details dialog, especially for RTL.Sascha Haeberling2013-08-221-1/+1
|/ | | | | | Bug: 7141309 Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
* Bring back the bottom controls in Filmstrip.Sascha Haeberling2013-08-192-13/+69
| | | | | | | | | Bug: 10367172 Bug: 10074320 Also hooks up the Edit button and the edit menu item. Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
* Brings back the details menu with most EXIF data in it.Sascha Haeberling2013-08-152-0/+45
| | | | | | | | Some are still missing and will come back later. Bug: 10330505 Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
* 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
* Fix video capture intent handlingDoris Liu2013-08-131-0/+1
| | | | | | Bug: 10296343 Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-062-1/+45
| | | | | | | | | | | | http://ag/339319 http://ag/338974 http://ag/338401 http://ag/324149 Adapted to work in Camera2 and adding a .gitignore so that temporary Eclipse files and folders are not submitted. Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-0663-2856/+0
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Add quality selector to export.Ruben Brunk2013-08-021-0/+80
| | | | | | | - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
* Hide "View Photo Sphere" button by default.Sascha Haeberling2013-08-011-0/+1
| | | | Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
* Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-011-5/+25
| | | | | | | | | | | This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
* Add user presets saving/loadingnicolasroard2013-07-302-0/+117
| | | | Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
* add Grad filterJohn Hoford2013-07-292-0/+77
| | | | Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
* Remove FilterIconButtonnicolasroard2013-07-031-18/+0
| | | | Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
* Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-211-23/+0
|\
| * Remove SRI panoramaDoris Liu2013-06-201-23/+0
| | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | Add flash animation to photo moduleDoris Liu2013-06-191-0/+7
|/ | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* Switch over to use new camera activityDoris Liu2013-06-186-167/+40
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Fix icon sizes and jaggiesnicolasroard2013-06-111-2/+2
| | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Add a layout for undo barDoris Liu2013-06-051-0/+31
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
| | | | Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
* Add secure camera support.Angus Kong2013-06-031-0/+23
| | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* Merge "Add new camera activity back and fix build errors" into ↵Doris Liu2013-05-164-0/+144
|\ | | | | | | gb-ub-photos-carlsbad
| * Add new camera activity back and fix build errorsDoris Liu2013-05-164-0/+144
| | | | | | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:59:05 +0000