summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix SRI orientation on mantaDoris Liu2013-10-203-2/+16
| | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
* merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | |\
| | | * Only delete the Uri coming from onMediaSavedztenghui2013-10-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The incoming Uri can be null, or a file Uri, which we don't want to delete. The Uri from onMediaSaved has been inserted to the MediaStore and pass null check. bug:11218007 Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-140-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | |\
| | | | | | * Avoid unnecessary bringChildToFront() calls.Angus Kong2013-10-111-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10750719 Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
| | | | | | * Increased time to wait in all tests.priya2013-10-104-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Change-Id: I76a824b5690d6913630560d58739e2df5cc1c259
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-070-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Add missing crop message.Sascha Haeberling2013-10-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
| | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Prevent NPE in gesture handling.Angus Kong2013-10-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:11023769 Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
| | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-300-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Restore HQ preference in GCam module.Angus Kong2013-09-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10860305 Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
| | | | | | | | | | | | | | | | * Fix memory leak of context in LocalMediaObserverDoris Liu2013-09-272-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10728773 Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
| | | | | | | | | | | | | | | | * Add HQ icon indicator support.Sascha Haeberling2013-09-262-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
| | | | | | | | | | | | | | | | * Remove PopupManager to remove a memory leakSeth Raphael2013-09-264-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PopupManager had been previously refactored out but vestiges remained. They were causing a memory leak of Activities in its hash map. Bug: 10728773 Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
| | | | | | | | | | | | | | | | * Make ROI size 1/8 of longer edge of the imageDoris Liu2013-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10863323 Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
| | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * Sort and select the preview fps range for still image.ztenghui2013-09-232-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10842868 Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
| | | | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | \ am 9db92826: Merge "Send an message to decouple the gcam module change." ↵ztenghui2013-10-161-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '9db9282667d9e272702cd2ee32d7415204084530': Send an message to decouple the gcam module change.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Send an message to decouple the gcam module change." into ↵ztenghui2013-10-161-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | | | | | | | | | | | | | | | | | | Send an message to decouple the gcam module change.ztenghui2013-10-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case, we try to enter GCam module directly which cause the mCameraDevice to become null for photo module. Therefore we post a message to switch into GCam to make sure current mode switch complete first. bug:11252237 Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
* | | | | | | | | | | | | | | | | | | | | | | am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbadAri Sachter-Zeltzer2013-10-165-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '66f3948315b6bf851dcd5d618d96d6fcda49f159': update camera launcher icon
| * | | | | | | | | | | | | | | | | | | | | | Merge "update camera launcher icon" into gb-ub-photos-carlsbadAri Sachter-Zeltzer2013-10-165-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | update camera launcher iconAri Sachter-Zeltzer2013-10-165-0/+0
| | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed b/11252230 Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
* | | / / / / / / / / / / / / / / / / / / / / am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbadDoris Liu2013-10-163-23/+28
|\| | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bd95307ecdca5c7661bc3fb1765313ceb62e92a': Fix shutter covering pie menu
| * | | | | | | | | | | | | | | | | | | | | Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbadDoris Liu2013-10-163-23/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Fix shutter covering pie menuDoris Liu2013-10-163-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11247988 Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
* | | | | | | | | | | | | | | | | | | | | | am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing ↵Igor Murashkin2013-10-151-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into gb-ub-photos-carlsbad * commit '5e82f81a7c7daaf8ac86dbd688b344027f97ff64': gcam: Fix AF spinner not to reset when changing position
| * | | | | | | | | | | | | | | | | | | | | Merge "gcam: Fix AF spinner not to reset when changing position" into ↵Igor Murashkin2013-10-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | | | | | | | | | | | | | | | | | | gcam: Fix AF spinner not to reset when changing positionIgor Murashkin2013-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10936156 Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
* | | | | | | | | | | | | | | | | | | | | | | am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" ↵Doris Liu2013-10-151-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '08749a4ed22c5001aa476a9a30df323b00a6df7d': Dismiss switcher popup when shutter button is clicked
| * | | | | | | | | | | | | | | | | | | | | | Merge "Dismiss switcher popup when shutter button is clicked" into ↵Doris Liu2013-10-151-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | | | | | | | | | | | | | | | | | | Dismiss switcher popup when shutter button is clickedDoris Liu2013-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11224722 Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
* | | | | | | | | | | | | | | | | | | | | | | am d3e75bd7: Merge "CameraUtil: add float clamp function" into ↵Igor Murashkin2013-10-151-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'd3e75bd748ce2be8fdcb30575bbde9bd07536bd3': CameraUtil: add float clamp function
| * | | | | | | | | | | | | | | | | | | | | | Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbadIgor Murashkin2013-10-1585-14101/+15692
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | CameraUtil: add float clamp functionIgor Murashkin2013-10-141-1/+7
| | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10936156 Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 17:52:49 +0000