summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make Camera work on lock screen (secure mode)HEADmasterWolfgang Wiedmeyer2015-10-094-3/+86
| | | | Change-Id: I2ea9993738430f8c59f9e69cd2f75e6acccdc9eb
* LegacyCamera: CA translationsarnau2013-08-251-0/+38
| | | | Change-Id: I28d969f38fecec7db37dd68c85d481f81ae027c0
* LegacyCamera: PT-BR update translationsGustavo2013-07-061-0/+37
| | | | Change-Id: Ic044d581295240a69d296b802875f99a5e59e903
* Merge "LegacyCamera: Load correct panorama JNI libs" into cm-10.1Danny Baumann2013-05-302-2/+2
|\
| * LegacyCamera: Load correct panorama JNI libsKonsta Tuomio2012-12-152-2/+2
| | | | | | | | Change-Id: I26f7ada118874d00667e7a4373ceae10adcb30de
* | LegacyCamera: German translationjackmu952013-05-281-0/+37
| | | | | | | | Change-Id: I76cf6e803b7b39110288669119c86bf1c4ed6de7
* | LegacyCamera: DA translationJacob Overgaard Madsen2013-05-161-0/+37
| | | | | | | | | | | | | | From staging branch Patchset 2: Spacing of copyright Change-Id: I1756752f688f445da2016228ddb797c6ef914773
* | LegacyCamera: NB translationOdin Ugedal2013-05-111-0/+37
| | | | | | | | | | | | | | | | PS2: Trying to make Cid happy! Commit for staging: http://review.cyanogenmod.org/#/c/37279/ Change-Id: I5dc049f17b395e620b3fbaebe99881931dca6365
* | LegacyCamera: Add missing AF translationsisimobile2013-05-071-0/+38
| | | | | | | | Change-Id: Id73109fd772128e52b69332f55c39174ae32b428
* | LegacyCamera : refactor in cm_strings.xmlDelPETER2013-04-307-42/+52
| | | | | | | | Change-Id: Ib72fce3b4fa2d2a8db22df60d23e975c7308c47a
* | LegacyCamera: HU translation refactoringTamás Tóth2013-04-291-0/+37
| | | | | | | | Change-Id: Icaabe1364bd955fe15e80e5bed47d71374443954
* | LegacyCamera: Update italian translationrheeze2013-04-281-0/+37
| | | | | | | | | | | | Do the translation refactoring with cm_* resources Change-Id: I5a6e37425f86465846633615e02791cc67b632f6
* | LegacyCamera : FR translationDelPETER2013-04-272-23/+37
| | | | | | | | Change-Id: I3e74bcce0b24d5e02233cf9af249e83afb5fc453
* | Merge "LegacyCamera: NL translations" into cm-10.1Marco Brohet2013-04-241-0/+37
|\ \
| * | LegacyCamera: NL translationsMarco Brohet2013-04-231-0/+37
| | | | | | | | | | | | Change-Id: Ida16f849f9a5b65f8578f159a655d546b673f70c
* | | Merge "LegacyCamera: ES translations" into cm-10.1Marco Brohet2013-04-242-25/+38
|\ \ \ | |/ / |/| |
| * | LegacyCamera: ES translationsdjMesias2013-04-212-25/+38
| | | | | | | | | | | | | | | | | | - Move CM additions to new file Change-Id: I347bcc295670fe6bc70159502ccf92491ddafa59
* | | LegacyCamera: Refactor default translationsMarco Brohet2013-04-232-23/+41
|/ / | | | | | | Change-Id: Iee4e5dec6235097ec5abe18c733a828a90e2045c
* | Merge "LegacyCamera : add french translation" into cm-10.1Marco Brohet2013-04-121-5/+28
|\ \
| * | LegacyCamera : add french translationDelPETER2013-04-061-5/+28
| | | | | | | | | | | | Change-Id: I7d3839809c4e5b6585626985d0d2f61a028f7626
* | | Merge "LegacyCamera: Reorganize Greek translations" into cm-10.1Marco Brohet2013-04-122-31/+48
|\ \ \
| * | | LegacyCamera: Reorganize Greek translationsMichael Bestas2013-04-082-31/+48
| |/ / | | | | | | | | | | | | | | | | | | | | | Revert AOSP strings & rearrange CM additions. Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I8ffdccec48c6be8df1525ceba682bbd0057387cb
* | | LegacyCamera: ES translationsdjMesias2013-04-121-0/+25
|/ / | | | | | | Change-Id: I33aff76bc6af2fd6b6cb24cc920bbd25d2631c3f
* | LegacyCamera: Fix build errorMichael Bestas2013-03-012-3/+1
| | | | | | | | | | | | | | | | Remove duplicate strings & minor update on Greek translation. Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I6328d4b67991743caa89bc6b90daf33af879e4d2
* | LegacyCamera: Update Greek translationsMichael Bestas2013-02-091-12/+32
| | | | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I174bbce51ed312056397d81acdcfe09b9599bd05
* | LegacyCamera: Hebrew TranslationOr Harambam2013-01-161-5/+33
|/ | | | Change-Id: I203fd87a2d3b3af2fcdbf5c599a6d78e204f6fc2
* CameraLegacy: add support for all camera resolutionsfreexperia2012-11-282-5/+85
| | | | Change-Id: I6d1e2c1fb86aafca6d0cebe11160a1e31f4a48a9
* merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
|\
| * Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
| | | | | | | | | | Bug:6294985 Change-Id: I7d10f694001b91eb81d0c8042e2f97bb0737a83c
* | Fix camera_control distorted in small resolution.akahuang2012-06-153-4/+10
| | | | | | | | | | | | | | Use minimum height of camera_control to fix it. bug:6228273 Change-Id: I7c623efe06e043664d696f753f08877cd34450a1
* | Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
|/ | | | | Bug:6294985 Change-Id: I7d10f694001b91eb81d0c8042e2f97bb0737a83c
* Fix NPE when only front cameras are available.Angus Kong2012-06-134-26/+9
| | | | | bug:6643208 Change-Id: Ie4eef4a671091cd9557d1c51ab5c3919b6b30652
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-047-22/+22
| | | | | | | The SDK needs a camera app that does not require GPU acceleration. The Camera app from 4.0.4 meets these requirements. Change-Id: Idb42d4b9e47d584ef1da10e3ba672d537c8db94b
* Fix the share popup. DO NOT MERGEAngus Kong2012-02-184-38/+9
| | | | | | | | | | Fix the share popup to comply with the new design: 1. Black background. 2. Image is centered. 3. Share popup won't rotate automatically. bug:6031042 Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
* Import translations. DO NOT MERGEEric Fischer2012-02-088-50/+67
| | | | Change-Id: I0719643bd6d66a3990dbfd2b6eb9e2fc64ab307e
* Merge "Do not allow switching to other activities during panorama capture. ↵Wei Huang2012-01-201-0/+15
|\ | | | | | | (do not merge)" into ics-mr1
| * Do not allow switching to other activities during panorama capture. (do not ↵Wu-cheng Li2012-01-201-0/+15
| | | | | | | | | | | | | | merge) bug:5541182 Change-Id: I1cdbba9a8aec3b5c832f6e58baa26ff6312cf59a
* | Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-123-34/+75
|/ | | | | bug: 5541182 Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
| | | | | | | | Since the Camera API is moving back to using the system audio stream, do not override the camera app volume control stream any more. Bug: 5778365 Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-062-3/+3
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-12-062-3/+3
| | | | | | | | Change-Id: If70739b6fc62ac7acf009355dc4cd5b9fabe8218
* | Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring defaults in camcorder mode, the indicator control calls onSharedPreferenceChanged if record location is on. onSharedPreferenceChanged is also called in the end of restorePreferences. With two onSharedPreferenceChanged calls in a row, the first call notices effects have been disabled, and begins the effect pipeline teardown in the background thread. Normally, this would conclude in a few hundred milliseconds, and would then restart regular preview. However, with the second call to onSharedPreferenceChanged coming in right after the first, the method no longer sees an effect transition in progress (since current and new effect are equal to none now), and thus just ends up restarting preview. That attempt at restart runs into the crash because the main SurfaceView has not yet been released by the background effects thread. To fix this, InLineSettingSwitch should not invoke the listener when updating UI. bug:5679133 Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe
* Import revised translations. DO NOT MERGEEric Fischer2011-11-293-5/+5
| | | | Change-Id: I3dc168e6ebcec5b133ca21dc8175d959798927b9
* Fix NPE if the camera cannot be connected.Wu-cheng Li2011-11-281-1/+1
| | | | | bug:5673972 Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9
* Dismiss open menu if exists.Chung-yih Wang2011-11-223-0/+11
| | | | | bug:5648754 Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
* Merge "Update camera sound API." into ics-mr1Wu-cheng Li2011-11-214-8/+21
|\
| * Update camera sound API.Wu-cheng Li2011-11-184-8/+21
| | | | | | | | | | bug:5640219 Change-Id: Ic3af6527f3025ec04ba4be16b621b462f89953f1
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-213-18/+18
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-213-18/+18
| |/ | | | | | | Change-Id: Ie3dd7e4f5b1adfd9fb7f5959ebc20416d8a13946
* | Fix share popup is not aligned with viewfinder.Wu-cheng Li2011-11-211-1/+1
|/ | | | | bug:5641001 Change-Id: I0d77a93a9c0ef5b7b661abf36028eb559981dc67
generated by cgit v1.1 at 2024-12-22 02:56:20 +0000