summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-12-0611-25/+267
|\
| * Don't show the alternates dialog for GAL contactsScott Kennedy2013-11-149-25/+70
| * merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
| |\
| | * camera2: Add updateCaptureRequest methodZhijun He2013-11-081-0/+21
| | * camera2: Add #resetState to AutoFocusStateMachineIgor Murashkin2013-11-081-0/+20
| * | Merge "camera2: Add updateCaptureRequest method" into klp-devZhijun He2013-11-071-0/+21
| |\ \
| | * | camera2: Add updateCaptureRequest methodZhijun He2013-11-061-0/+21
| | |/
| * | camera2: Add #resetState to AutoFocusStateMachineIgor Murashkin2013-11-061-0/+20
| |/
| * camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)Igor Murashkin2013-11-051-0/+35
| * Merge "gcam: Add empty SysTrace class" into klp-devIgor Murashkin2013-10-251-0/+121
| |\
| | * gcam: Add empty SysTrace classIgor Murashkin2013-10-181-0/+121
| * | camera2: Harden AutoFocusStateMachine against null values in callbacksIgor Murashkin2013-10-171-0/+24
| |/
* | camera2: Harden AutoFocusStateMachine against null values in callbacksIgor Murashkin2013-10-171-0/+24
|/
* am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a vali...Tony Mantler2013-10-161-0/+21
|\
| * Don't show pop-ups and dialogs if we're not attached to a valid window.Tony Mantler2013-10-151-0/+21
* | camera2: Skip AF state updates when afMode/afState are missingIgor Murashkin2013-10-151-2/+14
* | Revert "Revert "Camera2: Use hidden APIs""Eino-Ville Talvala2013-10-111-1/+1
* | Revert "Camera2: Use hidden APIs"Eino-Ville Talvala2013-10-111-1/+1
* | Camera2: Use hidden APIsEino-Ville Talvala2013-10-091-1/+1
* | Camera2: Add a blocking state listenerEino-Ville Talvala2013-10-061-0/+275
* | gcam: Make AF more tolerant to transitioning into same stateIgor Murashkin2013-10-051-4/+7
* | Merge "camera2: Add passive unfocused state to AF state machine" into klp-devIgor Murashkin2013-10-041-4/+4
|\ \
| * | camera2: Add passive unfocused state to AF state machineIgor Murashkin2013-10-041-4/+4
* | | am da5cd8c4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-040-0/+0
|\ \ \ | |/ / |/| / | |/
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-0423-5/+515
* | Merge "camera2: Add state machine for doing auto-focus easily from apps" into...Igor Murashkin2013-09-291-0/+275
|\ \
| * | camera2: Add state machine for doing auto-focus easily from appsIgor Murashkin2013-09-251-0/+275
* | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-2/+2
|/ /
* | camera2: New directory with camera2 extras/helpersIgor Murashkin2013-09-204-0/+421
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-1521-2/+512
* | Merge "Refactor List<Partition> to Partition[]" into klp-devAlon Albert2013-08-271-69/+66
|\ \
| * | Refactor List<Partition> to Partition[]Alon Albert2013-08-271-69/+66
* | | am 3be35a39: Remove some unused resources and importsScott Kennedy2013-08-237-20/+0
|\ \ \ | |/ / |/| / | |/
| * Remove some unused resources and importsScott Kennedy2013-08-237-20/+0
* | am 30d26326: Add directory photo supportJay Shrauner2013-08-101-14/+46
|\ \ | |/
| * Add directory photo supportJay Shrauner2013-08-091-14/+46
* | am bc742af5: Make Chips work on API 11+Scott Kennedy2013-08-064-5/+58
|\ \ | |/
| * Make Chips work on API 11+Scott Kennedy2013-08-034-5/+58
* | resolved conflicts for merge of b6c18ed6 to masterScott Kennedy2013-08-011-4/+0
|\ \ | |/
| * Remove an unnecessary null checkScott Kennedy2013-08-011-4/+0
* | am ad1d181c: Don\'t bother storing a null value in the cacheScott Kennedy2013-07-311-2/+4
|\ \ | |/
| * Don't bother storing a null value in the cacheScott Kennedy2013-07-301-2/+4
* | Support an External Dictionary of ContactsAlon Albert2013-07-213-33/+74
* | Merge "Set the build dir to be relative to a root folder."Adam Metcalf2013-07-091-1/+1
|\ \
| * | Set the build dir to be relative to a root folder.Adam Metcalf2013-07-091-1/+1
* | | am b5e00794: Fix some javadoc bugs.Andrew Sapperstein2013-07-011-5/+4
|\ \ \ | |/ / |/| / | |/
| * Fix some javadoc bugs.Andrew Sapperstein2013-07-011-5/+4
* | Merge jb-ub-mail-ur10 into masterPaul Westbrook2013-06-202-27/+34
|\ \ | |/
| * Prepare to remove a null checkScott Kennedy2013-06-191-0/+1
| * Fix a NPEScott Kennedy2013-06-071-27/+33