summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Redo snapshot if shutter button is clicked during SNAPSHOT_IN_PROGRESSreplicant-6.0-beta-0002replicant-6.0-beta-0001replicant-6.0-alpha-0006replicant-6.0Wolfgang Wiedmeyer2016-12-301-24/+34
| | | | | | | | | | | | | If the shutter button is clicked in the photo view, the interface will be in the SNAPSHOT_IN_PROGRESS state until the picture is taken. During this state, the app is unresponsive and if there is an issue with the camera HAL, the app may not leave this state. Let's restart the camera if the shutter is clicked a second time during this state and redo the snapshot. Previously, the app only registered that the shutter was pressed a second time and tried to take a second picture after the previous snapshot was finished. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* Merge branch 'master' of ↵Wolfgang Wiedmeyer2016-12-124-21/+34
|\ | | | | | | https://android.googlesource.com/platform/packages/apps/LegacyCamera into replicant-6.0
| * Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: ↵Chih-Hung Hsieh2016-07-262-18/+18
| |\ | | | | | | | | | | | | | | | | | | | | | 02301db045 am: 529b548597 am: 4b2c9d6005 Change-Id: I7aca5d67077ce7603b15a83c362fa516e9615b84
| | * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| | |\ | | | | | | | | | | | | | | | | | | | | am: 529b548597 Change-Id: Ifb6fabf15f1e74fecfafe1f7854553083c544375
| | | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"Chih-Hung Hsieh2016-07-262-18/+18
| | | |\ | | |/ / | | | | | | | | | | | | | | | | am: 02301db045 Change-Id: I0dfa52fa470876beb8248397352a1ec299f4bb41
| | | * Merge "Fix misc-macro-parentheses warnings in LegacyCamera."Chih-hung Hsieh2016-07-262-18/+18
| | | |\
| | | | * Fix misc-macro-parentheses warnings in LegacyCamera.Chih-Hung Hsieh2016-06-292-18/+18
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parentheses around negative literals and parameters beside operators. Bug: 28705665 Test: build with clang-tidy Change-Id: I137330a75fecd571ad6444ebde3d9c5c70e15ef1
| * | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 323cb09f89 * commit '323cb09f8965758e2ad4d4c0f7196d4307d2f953': Fix misc-macro-parentheses warnings. Change-Id: Ic5337829ee5a53770f1f352cc5700defccffe8bd
| | * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e3d129de20 * commit 'e3d129de200cd3ddd9bd5c63c54f032808a14816': Fix misc-macro-parentheses warnings. Change-Id: If3860faa8b582fa71a0aae72f5d7b795f53bf98a
| | | * \ Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d2cf3bda69 * commit 'd2cf3bda69b1286b6d2736a4e66a7e8b9cacc153': Fix misc-macro-parentheses warnings. Change-Id: I42e8a186d9f165135f4185e25be4f55506631420
| | | | * Merge "Fix misc-macro-parentheses warnings."Treehugger Robot2016-05-241-1/+1
| | | | |\ | | | |/ /
| | | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | | |/ | | | | | | | | | | | | | | | | Bug: 28705665 Change-Id: I034d8a7ff0ca6dbe179f5362f601cffc5b9522cf
| * | | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | am: 892f4f594d * commit '892f4f594d0a158ef57ea0e2493822bc005edd49': Prevent camera app crashes on changing hw.camera.* settings Change-Id: Ic45745e8911c8ba7240be749b453e0d770b3ac18
| | * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-05-031-2/+15
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | am: 996546fcf4 * commit '996546fcf4058d98d9aceecb4086283e17ae6c9d': Prevent camera app crashes on changing hw.camera.* settings Change-Id: I372bf5a00f021c89abda49966bc12eaca97a80c5
| | * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-04-271-2/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the AVD's config.ini changes hw.camera.*, this is effectively, connecting/disconnecting camera hardware, and the current way in which camera settings are handled assumes that the set of cameras never changes, which can lead to the camera app crashing if the camera app was used successfuly with one configuration of hw.camera.* and then the AVD was restarted with a different configuration. In particular, the crash happens if the number of cameras has been reduced since the last run, and the camera app is looking up a preferred camera ID that is not supported by the new number of cameras. bug: 28417929 BUG: https://code.google.com/p/android/issues/detail?id=206945 Change-Id: Ib0e26ae77d376f31f3cc281e386d3c67291c1edc (cherry picked from commit 8f339abd9245577c348f5ba22322e8801c21faf8)
* | update Manifestreplicant-6.0-alpha-0005replicant-6.0-alpha-0004replicant-6.0-alpha-0003replicant-6.0-alpha-0002replicant-6.0-alpha-0001Wolfgang Wiedmeyer2015-12-212-9/+7
| | | | | | | | | | | | | | also readd legacymosaic as required module, but not sure if that helps the preview is slower than on Replicant 4.2 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* | Merge tag 'android-6.0.1_r3' into replicant-6.0Wolfgang Wiedmeyer2015-12-187-597/+3
|\ \ | |/ | | | | Android 6.0.1 release 3
| * am 33e28809: Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| |\ | | | | | | | | | | | | * commit '33e2880955ff459f976ae4ffe5aced65e0e25e53': Add missing <string.h> include.
| | * Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| | |\
| | | * Add missing <string.h> include.Elliott Hughes2015-01-261-0/+2
| | |/ | | | | | | | | | Change-Id: I985a631fcca9553e046ae63e03f1aba6f2ff812e
| * | am e48f3382: Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| |\ \ | | |/ | | | | | | | | | * commit 'e48f33822a29d0cf0d72b68eb53e9662790e3fdb': Use and older standard version.
| | * Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| | |\
| | | * Use and older standard version.Dan Albert2014-11-201-0/+1
| | |/ | | | | | | | | | | | | Bug: 18466763 Change-Id: I87f8e4c0e797caaaf7d7731ca0b2932e4aee5df6
| * | am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
| |\ \ | | |/ | | | | | | | | | * commit '090283cfff2a09f1ea960fd2ef87564099027ab0': Remove deprecated locales - DO NOT MERGE
| | * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-191-199/+0
| | | | | | | | | | | | Change-Id: I451ab9f4007679305f67f9ae657f49464caf64e0
| * | Remove deprecated localesBaligh Uddin2014-07-171-199/+0
| |/ | | | | | | Change-Id: If35bd5efef047bcf7316c445559dfe16886ddbe6
| * am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-210-0/+0
| |\ | | | | | | | | | | | | * commit 'd9b5d8941d1ec47ff391da2b8cc8ec90f902062f': Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| | * Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-181-2/+0
| | |\
| | | * Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-181-2/+0
| | |/ | | | | | | | | | Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1
| * | Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-171-2/+0
| | | | | | | | | | | | Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1
| * | am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '8e944e6303d1c952929989f56da6b9d97bb54b3c': Loading the corresponding library in LegacyCamera app
| | * Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| | |\
| | | * Loading the corresponding library in LegacyCamera appJun Tian2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LegacyCamera app is loading wrong library in MosaicRenderer.java. It causes the camera app crash in the SDK image when changing the camera to panorma mode. Change-Id: I4c20af796622dd0e76a86ed7249d9b8fa54837b9
| * | | am be2086de: Merge "Fix the loading library issue of panorama mode in ↵Glenn Kasten2014-01-071-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Legacycamera app" * commit 'be2086dee3fac7f0a07d329021bfa7cb449d916b': Fix the loading library issue of panorama mode in Legacycamera app
| | * | Merge "Fix the loading library issue of panorama mode in Legacycamera app"Glenn Kasten2014-01-071-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix the loading library issue of panorama mode in Legacycamera appJun Tian2013-07-041-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Legacycamera app requires libjni_legacymosaic module, and this module is included in the makefile. But in the implementation code, it loads the libjni_mosaic module. This patch changed the loading library to fix crash issue when using panorama mode in the Legacycamera. Change-Id: Id7d4192b076412c674ef716c9ffcb31fe5cb6619 Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Zhu Yanglinx <yanglinx.zhu@intel.com> Signed-off-by: Chang Panfeng <panfengx.chang@intel.com>
| * | Remove deprecated localesBaligh Uddin2013-12-093-396/+0
| |/ | | | | | | | | | | Bug:11340849 Change-Id: I1c3fa9731b4d20f16bcfb88d070fba263086563e
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ | | | | | | | | | Change-Id: I498b24819154fc97ab5f846cd088810d68a982ea
* | \ Merge remote-tracking branch 'cyanogenmod/cm-11.0' into replicant-6.0Wolfgang Wiedmeyer2015-12-180-0/+0
|\ \ \
| * \ \ Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-250-0/+0
| |\ \ \ | | |/ / | | | | | | | | Android 4.3 release 2.1
| | * | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Idee820191b52f081d94c11787fe89452e1bf073d
* | | | | 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
generated by cgit v1.1 at 2024-12-22 03:49:00 +0000