summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
|\ | | | | | | Android 4.4.1 Release 1
| * Don't show the alternates dialog for GAL contactsScott Kennedy2013-11-149-25/+70
| | | | | | | | | | | | | | | | | | | | | | There's a bug in the chips code that causes this to show either no alternates, or a different person, which is scaring people. The proper future fix is to store some more information about GAL contacts so we can do a proper lookup. Bug: 11535331 Change-Id: Id8b6fc834446afe33bd6ec4e99b3d2b75b985bde
| * merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
| |\
| | * camera2: Add updateCaptureRequest methodZhijun He2013-11-071-0/+21
| | | | | | | | | | | | | | | | | | | | | It can be used to update repeating request with current auto focus mode. Bug: 10649854 Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
| | * camera2: Add #resetState to AutoFocusStateMachineIgor Murashkin2013-11-071-0/+20
| | | | | | | | | | | | | | | Bug: 11071158 Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
| * | Merge "camera2: Add updateCaptureRequest method" into klp-devZhijun He2013-11-071-0/+21
| |\ \
| | * | camera2: Add updateCaptureRequest methodZhijun He2013-11-061-0/+21
| | |/ | | | | | | | | | | | | | | | | | | It can be used to update repeating request with current auto focus mode. Bug: 10649854 Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
| * / camera2: Add #resetState to AutoFocusStateMachineIgor Murashkin2013-11-061-0/+20
| |/ | | | | | | | | Bug: 11071158 Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
| * camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)Igor Murashkin2013-11-041-0/+35
| | | | | | | | | | Bug: 11071158 Change-Id: I6a1d0130b6ca36c853f539ef3f1afb363a70df24
| * Merge "gcam: Add empty SysTrace class" into klp-devIgor Murashkin2013-10-251-0/+121
| |\
| | * gcam: Add empty SysTrace classIgor Murashkin2013-10-181-0/+121
| | | | | | | | | | | | | | | Bug: 11071158 Change-Id: I31f8c449dc4c47c610b0ef3c24849e0402634c86
| * | camera2: Harden AutoFocusStateMachine against null values in callbacksIgor Murashkin2013-10-171-0/+24
| |/ | | | | | | | | Bug: 11269834 Change-Id: Id3cb85eb3e9aaaf6714fd81a5d53811d4cbfefa9
* / camera2: Harden AutoFocusStateMachine against null values in callbacksIgor Murashkin2013-10-171-0/+24
|/ | | | | Bug: 11269834 Change-Id: Id3cb85eb3e9aaaf6714fd81a5d53811d4cbfefa9
* am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a ↵Tony Mantler2013-10-151-0/+21
|\ | | | | | | | | | | | | valid window. * commit 'eaf43ea2c3b00af22f0aa106fd3dde142f52d471': Don't show pop-ups and dialogs if we're not attached to a valid window.
| * Don't show pop-ups and dialogs if we're not attached to a valid window.Tony Mantler2013-10-151-0/+21
| | | | | | | | | | | | b/11229200 Change-Id: Ic44da79e441017ac4ccdb4a254c13965da0cc2f9
* | camera2: Skip AF state updates when afMode/afState are missingIgor Murashkin2013-10-151-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | * Workaround for hal3 sometimes dropping afMode/afState (rarely) - don't update AF states, instead just skip this frame, safer and adds 1 frame of latency very rarely sometimes. * Assumes request is repeating, since otherwise we wouldn't get future af transition results Bug: 11238865 Change-Id: Ic793d8c6d44873f6a7983e84e4510b8587a148a0
* | Revert "Revert "Camera2: Use hidden APIs""Eino-Ville Talvala2013-10-111-1/+1
| | | | | | | | | | | | | | | | Play it again, Gerrit. This reverts commit 08f250d97f3cd9d4a26983725f82b9f88ea4b9d8. Bug: 11141002
* | Revert "Camera2: Use hidden APIs"Eino-Ville Talvala2013-10-111-1/+1
| | | | | | | | | | | | This reverts commit 51bb20d6396609a61aff93e9e7b9f878aa0bcee3. Change-Id: Iafc4f7a3834fd1ea781ed5f423efbde95c160fe6
* | Camera2: Use hidden APIsEino-Ville Talvala2013-10-081-1/+1
| | | | | | | | | | Bug: 11141002 Change-Id: I351460e418c0084258984694c0289ef54250100f
* | Camera2: Add a blocking state listenerEino-Ville Talvala2013-10-061-0/+275
| | | | | | | | | | | | | | | | - Provides wait() methods for waiting on a desired state to be reached - Only one waiter at a time Bug: 10360518 Change-Id: Iab114584dfa4ab34c7a7b31ed243a3f6a3fc9c58
* | gcam: Make AF more tolerant to transitioning into same stateIgor Murashkin2013-10-041-4/+7
| | | | | | | | | | Bug: 11014205 Change-Id: I669873307943bfdfbe67e688d1b2de24acd87550
* | 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
| | | | | | | | | | | | | | | | | | | | | * Also fix minor issue where passive focused state was falsely locking Bug: 11014205 Change-Id: Ic53e455693aa4f14d776658625d4ba8fa7dc2f51
* | | am da5cd8c4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-040-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit 'da5cd8c434eb4a4c5083a0ad0e2808c5ced58ea0': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-0423-5/+515
| | | | | | | | | | Change-Id: I288fc01b87fa8b157e0638fd2f230902d226acce Auto-generated-cl: translation import
* | Merge "camera2: Add state machine for doing auto-focus easily from apps" ↵Igor Murashkin2013-09-291-0/+275
|\ \ | | | | | | | | | into klp-dev
| * | camera2: Add state machine for doing auto-focus easily from appsIgor Murashkin2013-09-241-0/+275
| | | | | | | | | | | | | | | Bug: 10890749 Change-Id: I966768bdcdbb2876d44eefc2156e7aca64c4e601
* | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-2/+2
|/ / | | | | | | | | Change-Id: I37d473e0fad705d9e5cd5573c37dbce9bf1eb32e Auto-generated-cl: translation import
* | camera2: New directory with camera2 extras/helpersIgor Murashkin2013-09-204-0/+421
| | | | | | | | | | | | | | | | * Simplify using camera2 when possible * Offer a blocking openCamera call to not have to deal with listeners Bug: 10360518 Change-Id: I7f154db3a5300437785d6e8d0bfff5499ef9bc15
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-1421-2/+512
| | | | | | | | | | Change-Id: I2232e476c87dd819bd6b8c785332fbb5b1f49738 Auto-generated-cl: translation import
* | Merge "Refactor List<Partition> to Partition[]" into klp-devAlon Albert2013-08-271-69/+66
|\ \
| * | Refactor List<Partition> to Partition[]Alon Albert2013-08-261-69/+66
| | | | | | | | | | | | | | | | | | | | | And add an addPartition(int location, Partition partition) method. The refactoring make adding this method much easier. Change-Id: Ife051b19837c2719e9487d7bc4f14095e76cc141
* | | am 3be35a39: Remove some unused resources and importsScott Kennedy2013-08-227-20/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '3be35a398afee202a794134920782db901ee36cd': Remove some unused resources and imports
| * Remove some unused resources and importsScott Kennedy2013-08-227-20/+0
| | | | | | | | Change-Id: Ifc9bbd7fa53972b4d2bd61d04a426017a6bd63f5
* | am 30d26326: Add directory photo supportJay Shrauner2013-08-091-14/+46
|\| | | | | | | | | * commit '30d26326568cb888430468370df6f6ab2ec12767': Add directory photo support
| * Add directory photo supportJay Shrauner2013-08-091-14/+46
| | | | | | | | | | | | | | Load photos for directory thumbnail URIs by streaming directly from the URI. Bug:7882158 Change-Id: Ifdf354c392b9aaff7c8fd6b73dc9bfe891825329 (cherry picked from commit 53d11c53b83bffe7607cffde994f505e775bcdbe)
* | am bc742af5: Make Chips work on API 11+Scott Kennedy2013-08-064-5/+58
|\| | | | | | | | | * commit 'bc742af5bb568ed39dc37764587120928d068330': Make Chips work on API 11+
| * Make Chips work on API 11+Scott Kennedy2013-08-024-5/+58
| | | | | | | | | | | | | | | | By using the support library, and copying a few methods from TextView into RecipientEditTextView, we can support chips back to API 11. Bug: 8744878 Change-Id: I2d9bb43e71556504e929dcdccff9dae347020f28
* | resolved conflicts for merge of b6c18ed6 to masterScott Kennedy2013-08-011-4/+0
|\| | | | | | | Change-Id: I7617af351d1fa7e4ce9ff401beffe21690b429d3
| * Remove an unnecessary null checkScott Kennedy2013-08-011-4/+0
| | | | | | | | | | Bug: 9497893 Change-Id: Ib363fc4b93a53c343e0e4cd4766038fee8324850
* | am ad1d181c: Don\'t bother storing a null value in the cacheScott Kennedy2013-07-301-2/+4
|\| | | | | | | | | * commit 'ad1d181cd21ee598512c142150e79be754209548': Don't bother storing a null value in the cache
| * Don't bother storing a null value in the cacheScott Kennedy2013-07-291-2/+4
| | | | | | | | | | | | | | It serves very little purpose, and it causes an NPE. Bug: 9286049 Change-Id: I8c95d8ded2bebdc9b904ef788cbc70865144213e
* | Support an External Dictionary of ContactsAlon Albert2013-07-213-33/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow support for an external custom source of contacts. By making some classes & methods protected rather than private, it's possible to allow for a derived class to extend the Chips behavior to load contacts from an arbitrary source. Most of the changes here are just access modifier changes but there's one more substantial change: Intruduced BaseRecipientAdapter#getMatchingRecipients() which matches generated recipients with proper chips recipients from the external sources. Ideally RecipientAlternatesAdapter#getMatchingRecipients() should reside in the adaper too but the goal of this CL was to do this minimal modifications. There's also a small change that beileve was a bug in IndividualReplacementTask: The matchesFound() callback gets a list of matches found. It then iterates all the original recipients and looks for those that have matches and replaces them. So far so good but, if the original recipient doesn't have a match and is not a phone number, the old code still replaces it with itself when it can simply skip it I think. Change-Id: I24e89f93ec15154ed8912664cd061fa2b5b18bd8
* | 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-081-1/+1
| | | | | | | | | | | | Change-Id: I61614f9cf0564ebf077c27bebfb02f4a06e00f64
* | | am b5e00794: Fix some javadoc bugs.Andrew Sapperstein2013-07-011-5/+4
|\ \ \ | |/ / |/| / | |/ | | * commit 'b5e0079419300f09253f160e0bdd28aa1bef4605': Fix some javadoc bugs.
| * Fix some javadoc bugs.Andrew Sapperstein2013-07-011-5/+4
| | | | | | | | Change-Id: I10c04c3b69f68b44ff27bbbb1abcc2a0b60fd18a
* | Merge jb-ub-mail-ur10 into masterPaul Westbrook2013-06-202-27/+34
|\| | | | | | | Change-Id: I37d9f0d0d2c8e72d59694c284d064070b615c60d
| * Prepare to remove a null checkScott Kennedy2013-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | I am fairly convinced that the fix for 9408464 will also fix the underlying problem of this adapter being null. If this log method is ever called, then I'll know it didn't work, but I believe this will never be called. Bug: 9497893 Change-Id: I08518ceecee6985462d0165fb16b1dea95181b07
| * Fix a NPEScott Kennedy2013-06-071-27/+33
| | | | | | | | | | | | | | | | We may not get a cursor back from query(), and if that happens, we shouldn't try to use the null cursor. Bug: 9287151 Change-Id: Ie91d8003f51ea160e5b709a5cd6bcabefc3c687a