summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-0668-290/+462
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Import translations. DO NOT MERGEBaligh Uddin2013-11-181-1/+1
| | | | | | | | | | Change-Id: I41cd8145da8f2907c6c5b20713a28f3e47791bcc Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2013-11-1155-390/+195
| | | | | | | | | | Change-Id: I19829aa0316b38df602b026e39213f11ca02d4d9 Auto-generated-cl: translation import
| * am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbadSascha Haeberling2013-11-071-0/+2
| |\ | | | | | | | | | | | | * commit '2b78c0c048fe906beaeadeee3e267524c808c340': Add GCam progress indicator.
| | * Add GCam progress indicator.Sascha Haeberling2013-11-071-0/+2
| | | | | | | | | | | | | | | | | | Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-0755-239/+480
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-11-0655-239/+480
| | | | | | | | | | | | | | | | | | | | Change-Id: I89b964b8ab69359b791eac89bf99b8d518678e27 Auto-generated-cl: translation import
| * | | am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into ↵ztenghui2013-11-061-0/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | gb-ub-photos-carlsbad * commit '189bfea2c8fd3374aac99f4c18cda357fcf2a371': Fix the RTL layout in the app's manifest.
| | * Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbadztenghui2013-11-061-0/+2
| | |\
| | | * 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
| * | | am 2bcb8d1f: add \'capturing\' string for in process indicatorsAlan Newberger2013-11-051-0/+3
| |\| | | | | | | | | | | | | | | | | | * commit '2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb': add 'capturing' string for in process indicators
| | * | add 'capturing' string for in process indicatorsAlan Newberger2013-11-051-0/+3
| | |/ | | | | | | | | | | | | | | | | | | This string can be used for in progess screen indicators. Bug: 11505806 Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
| * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-0555-3/+67
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-11-0455-3/+67
| | | | | | | | | | | | | | | | | | | | Change-Id: I0f4b4f2b969168513e77763bcd64027fc2a67445 Auto-generated-cl: translation import
| * | | am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" ↵Alan Newberger2013-11-041-3/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'bf4ce93c84400357a28f78a76df62b550e7f85d1': adjust keyguard camera layout to make buttons match
| | * | Merge "adjust keyguard camera layout to make buttons match" into ↵Alan Newberger2013-11-041-3/+3
| | |\ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | | * | adjust keyguard camera layout to make buttons matchAlan Newberger2013-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by trial and error adjusted the bottom margins of the controls to make transition to real camera layout seamless on the HH and N4. Bug: 11236276 Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28
| * | | | am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbadAlan Newberger2013-11-041-4/+4
| |\| | | | | |_|/ | |/| | | | | | | | | | * commit '7f044e2eb182f1d1ae023d55f30757439a17ee09': Adjust HDR options menu details
| | * | Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbadAlan Newberger2013-11-041-4/+4
| | |\ \
| | | * | Adjust HDR options menu detailsAlan Newberger2013-11-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To better align HDR/HDR+ menu options with other menu options, shortening the description and making it all caps. Bug: 11481286 Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
| * | | | am ccfafd95: Merge "Add Samsung front camera resolutions" into ↵Alan Newberger2013-11-012-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'ccfafd95cd4fa046df9d43469d28152f8a04bfed': Add Samsung front camera resolutions
| | * | | Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbadAlan Newberger2013-11-012-0/+12
| | |\ \ \
| | | * | | Add Samsung front camera resolutionsMichael Kolb2013-11-012-0/+12
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
| * | | | am 238d6ec7: Add new notification icon.Sascha Haeberling2013-11-014-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '238d6ec7a9a7a33ceeb5de9cd0dd22cea6a1bff7': Add new notification icon.
| | * | | Add new notification icon.Sascha Haeberling2013-11-014-0/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 11417480 Change-Id: I072a1348d515b2cd435748e2db2824e98a604413
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-303-61/+61
| | | | | | | | | | | | | | | | | | | | Change-Id: I87da2fbfde7c44784a1597a7158dd385ce65d21a Auto-generated-cl: translation import
| * | | am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbadRuben Brunk2013-10-281-0/+29
| |\| | | | | | | | | | | | | | | | | | * commit '0a64e00e88514ae07c3514e19126c166dda0ca82': gcam: Add placeholder image.
| | * | gcam: Add placeholder image.Ruben Brunk2013-10-281-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-211-4/+4
| |/ / | | | | | | | | | | | | Change-Id: I6731c0dc80337184cc87329ca824164899563b5f Auto-generated-cl: translation import
| * | Update HDR/HDR+ arc menu hover messages.Sascha Haeberling2013-10-171-4/+4
| | | | | | | | | | | | | | | | | | Bug : 11185194 Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
| * | Merge "Show a preview cover until real preview is ready" into ↵Doris Liu2013-10-173-0/+18
| |\ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | Show a preview cover until real preview is readyDoris Liu2013-10-153-0/+18
| | | | | | | | | | | | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-10-1755-444/+224
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1755-444/+224
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89 Auto-generated-cl: translation import
* | | | 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: Add support for setting DISAlok Kediya2013-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This patch allows the CamCorder client to configure DIS from the UI menu. Supported modes by the camera are parsed and dynamically filtered. (cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda) Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed Conflicts: src/com/android/camera/CameraSettings.java (cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884) (cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
* | | | Camera: Add support for setting AE Bracketing.Alok Kediya2013-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This modification re-enables the AE bracketing UI option and adds the necessary logic for parsing and filtering the supported AE bracketing modes by the camera. (cherrypicked from commit 0b2b18f2a6b89da004db8c36420fc61f0e884290) Change-Id: I5aea466eed9a3de4a899cced1e03c5177e57104b Conflicts: src/com/android/camera/CameraSettings.java Conflicts: src/com/android/camera/CameraSettings.java (cherry picked from commit 8cd8e6797ed3ce856bb4d7771085e1678bea7f25) (cherry picked from commit 24b84fd5855235b8710a625e42a0f2879cc1d898)
* | | | Camera: Video HDR Feature IntegrationAlok Kediya2013-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Video HDR support on UI. (cherrypicked from commit 423f0e277390cd4cbb87c89d063820ad0a953631) Change-Id: I14d2a7002fbaa4859ceb19317490e8843786ce35 (cherry picked from commit b2afb0f26563599e65564dea9605c7bc7d8aa29c) (cherry picked from commit a31228372a155dc1c02c7fb0669ea350c55c661d)
* | | | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-314-3/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Camera: Fix for focus mode option missing in camera settingsAlok Kediya2013-10-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add "Normal" and "CAF" options under focus mode settings (cherrypicked from commit ce394a31d3ad72228861322ff8cf82e494ddf358) Change-Id: Id9168d43d92adf3e209896b2501f28d4a0f0293c (cherry picked from commit c207527c898023862063dac98e60da0490af27f1) (cherry picked from commit 631d0f1abe7447915bd6fd75308d523d7a734cfb) (cherry picked from commit 8ccaca55d0b6cd75321ab26f2781ae6f8c737270)
* | | | Camera: Add initial QCom value add features.Alok Kediya2013-10-315-13/+1255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enhance the camera picture size table by adding more number of supported resolutions. - Enhance the camcorder menu by adding support for additional video and audio codecs. - Also provide option to select the duration of the recording clip. (cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e) Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5 (cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17) (cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec) (cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
* | | | am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbadAri Sachter-Zeltzer2013-10-165-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '66f3948315b6bf851dcd5d618d96d6fcda49f159': update camera launcher icon
| * | | update camera launcher iconAri Sachter-Zeltzer2013-10-165-0/+0
| |/ / | | | | | | | | | | | | | | | fixed b/11252230 Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
| * | Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbadIgor Murashkin2013-10-1559-11940/+15663
| |\ \
* | | | am d8b555b8: Merge "Updating shutter button resources" into ↵Sascha Haeberling2013-10-1464-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'd8b555b801c5e57bfbeca27ef38bea7688286c3c': Updating shutter button resources
| * | | Updating shutter button resourcesSascha Haeberling2013-10-1464-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11155984 Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1455-442/+222
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 04:27:19 +0000