summaryrefslogtreecommitdiffstats
Commit message (Expand)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
* Merge branch 'master' of https://android.googlesource.com/platform/packages/a...Wolfgang Wiedmeyer2016-12-124-21/+34
|\
| * Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: 02301d...Chih-Hung Hsieh2016-07-262-18/+18
| |\
| | * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| | |\
| | | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"Chih-Hung Hsieh2016-07-262-18/+18
| | | |\ | | |/ /
| | | * 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
| | | |/
| * | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \
| | | * \ Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | | |\ \ | | | | |/
| | | | * Merge "Fix misc-macro-parentheses warnings."Treehugger Robot2016-05-241-1/+1
| | | | |\ | | | |/ /
| | | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | | |/
| * | | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-05-031-2/+15
| | |\ | |/ /
| | * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-04-271-2/+15
| |/
* | 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
* | Merge tag 'android-6.0.1_r3' into replicant-6.0Wolfgang Wiedmeyer2015-12-187-597/+3
|\ \ | |/
| * am 33e28809: Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| |\
| | * Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| | |\
| | | * Add missing <string.h> include.Elliott Hughes2015-01-261-0/+2
| | |/
| * | am e48f3382: Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| |\ \ | | |/
| | * Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| | |\
| | | * Use and older standard version.Dan Albert2014-11-201-0/+1
| | |/
| * | am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
| |\ \ | | |/
| | * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-191-199/+0
| * | Remove deprecated localesBaligh Uddin2014-07-171-199/+0
| |/
| * am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-210-0/+0
| |\
| | * 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
| | |/
| * | Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-171-2/+0
| * | am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\ \ | | |/
| | * 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
| * | | am be2086de: Merge "Fix the loading library issue of panorama mode in Legacyc...Glenn Kasten2014-01-071-1/+1
| |\ \ \ | | |/ /
| | * | 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
| | |/
| * | Remove deprecated localesBaligh Uddin2013-12-093-396/+0
| |/
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\
* | \ 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
| |\ \ \ | | |/ /
| | * | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \
* | | | | make Camera work on lock screen (secure mode)HEADmasterWolfgang Wiedmeyer2015-10-094-3/+86
* | | | | LegacyCamera: CA translationsarnau2013-08-251-0/+38
|/ / / /
* | | | LegacyCamera: PT-BR update translationsGustavo2013-07-061-0/+37
* | | | 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
* | | | | LegacyCamera: German translationjackmu952013-05-281-0/+37
* | | | | LegacyCamera: DA translationJacob Overgaard Madsen2013-05-161-0/+37
* | | | | LegacyCamera: NB translationOdin Ugedal2013-05-111-0/+37
* | | | | LegacyCamera: Add missing AF translationsisimobile2013-05-071-0/+38
generated by cgit v1.1 at 2024-12-21 17:12:11 +0000