summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in lmp-release history after reset to ↵staging/cm-12.0-cafThe Android Automerger2014-10-210-0/+0
|\ | | | | | | 91bceebd0bb15a5d20d43f8eca808114b96eb5ce
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-210-0/+0
|/| | | | | | | 91bceebd0bb15a5d20d43f8eca808114b96eb5ce
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-190-0/+0
|/| | | | | | | 91bceebd0bb15a5d20d43f8eca808114b96eb5ce
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| |\ | | | | | | | | | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| |/| | | | | | | | | | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| |/| | | | | | | | | | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| |/| | | | | | | | | | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| |/| | | | | | | | | | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| | |\ | | | | | | | | | | | | 7ba23fed935fa796c9c76b16c9bae79bf3f8b969
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| | |/| | | | | | | | | | | | | 7ba23fed935fa796c9c76b16c9bae79bf3f8b969
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| | |/| | | | | | | | | | | | | 7ba23fed935fa796c9c76b16c9bae79bf3f8b969
| | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| | | |\ | | | | | | | | | | | | | | | d30fdee360db38e93e4639bd1c28049d0b6b09e0
| | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | 0021c30190af49119ee319af6b207643b417c6c3
| | | | | * Trap CameraAgentFactory RTEs during recycleAlan Newberger2014-10-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17759456 Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
| | | | | * Trap camera close exceptions on pauseAlan Newberger2014-10-021-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17759456 Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
| | | | | * merge in lmp-release history after reset to lmp-devThe Android Automerger2014-10-020-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | d822d1cfc893faa6f3d5b566a50c628ec83fa4e6
| | | | | | | * Stability: call stopPreview() before switching off video module.Senpo Hu2014-09-301-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the preview is not stopped, the following camera operations posted by other modules such as "apply settings" will turn camera object in turmoil. The camera object could start throwing exception and eventually hang. Bug: 16300704 Bug: 17403384 Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9
| | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f727affa9fa62c8395f628c193c36b1ab299d81
| | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed0fea9b36e2f645f06e04d8ac28142333621010
| | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6014e1682d94b687c4525cf49e6c4b20bbb4380a
| | | | | | | | | | * Stability: add null check for all CameraProxy obj references inSenpo Hu2014-09-262-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VideoModule. Bug: 17657161 Bug: 17653725 Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d
| | | | | | | | | | * Recreate a OneCameraManager instance for each Activity.Puneet Lall2014-09-262-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17484715 Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e
| | | | | | | | | | * Force filmstrip images to generate in JPEG compression formatAlan Newberger2014-09-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to https://github.com/bumptech/glide/issues/156, we sometimes were getting PNG cache image generation which greatly increased latency and introduced jank. As workaround, explicitly forcing images to utilize JPEG format. Bug: 17597861 Change-Id: I49d7266d4ff0173d253877612b3076489a6b385a
| | | | | | | | | | * Stability: add null check for all CameraProxy obj references in PhotoModule.Senpo Hu2014-09-251-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17643705 Bug: 17604028 Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc
| | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-250-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f8c75b21820b64551a3226ab71bdb7707b286f9
| | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8dbf53c7235456fc2fd3e0e77e50e5d6c00a753
| | | | | | | | | | | | * monkey test NPE fix, another null check on mCameraDeviceSpike Sprague2014-09-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17604028 Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
| | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9
| | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee
| | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-210-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee
| | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0697c5b879f48ad009192028b34578eae42f394
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | |/|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee
| | | | | | | | | | | | | | * add null check to updateCameraParametersPreferences to apease the monkeySpike Sprague2014-09-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17580046 Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
| | | | | | | | | | | | | | * portability layer doesn't work well with startPreviewWithCallback()Spike Sprague2014-09-191-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | here's a dirty dirty workaround. bug: 17576554 Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9
| | | | | | | | | | | | | | * mode switch jank fixesSpike Sprague2014-09-187-226/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | puts many ValueAnimators news into initialize methods changes startPreview() calls to startPreviewWithCallback() puts MultToggleImageButton's bitmap combine into an AsyncTask bug: 17070332 Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c
| | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-180-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-170-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-160-0/+0
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d7a8c08446f94264870538f76bc0c2846e0dd48
| | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-150-0/+0
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c56b2c4bf6b31dee65806fcfa67b877657c3975
| | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-140-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c56b2c4bf6b31dee65806fcfa67b877657c3975
| | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc606712deb946dc978cac3fef16851894c06e29
| | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | |/|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c56b2c4bf6b31dee65806fcfa67b877657c3975
| | | | | | | | | | | | | | | | | * Revert layout change for CameraAlan Newberger2014-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of Action Bar. Bug: 17477202 Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde
| | | | | | | | | | | | | | | | | * Establish synchronous camera closing when app utilizes API1/API2Alan Newberger2014-09-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure API1 and API2 portability implementations coordinate together, if app uses API2 for any mode, lock both modes into synchronouse camera closing. Bug: 17464089 Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
| | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-110-0/+0
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3db7916c770c33feffa34dc2da486af66ab8a13
| | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-100-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aefc884cf5bd12b8caa0a657c33072010cd3234c
| | | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-090-0/+0
| | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3da669a022b8c43633288eb5f3fd736a2fe82e53
| | | | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc563a3713e1cd6c4cc2c1681cac081b753e161b
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc563a3713e1cd6c4cc2c1681cac081b753e161b