summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)Wolfgang 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
generated by cgit v1.1 at 2025-01-10 18:11:10 +0000