summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am b2d70d5b: Fix various message issuesSascha Haeberling2013-09-181-13/+19
|\ | | | | | | | | * commit 'b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b': Fix various message issues
| * Fix various message issuesSascha Haeberling2013-09-181-13/+19
| | | | | | | | | | | | | | | | | | | | Bug: 10568697 Bug: 10589224 Bug: 10561095 Bug: 10589353 Bug: 10570925 Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf
* | am 638e6f06: Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-1821-2128/+131
|\| | | | | | | | | * commit '638e6f06c877d90b907f66ea9c22b3c6b73c7384': Clean up ApiHelper and remove unused code paths.
| * Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-1821-2128/+131
| | | | | | | | | | | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* | am 4ed20592: Adding Hideybar support for K and up.Sascha Haeberling2013-09-182-22/+57
|\| | | | | | | | | * commit '4ed20592482d2ab2f3f48ee72d5b1c06bf009034': Adding Hideybar support for K and up.
| * Adding Hideybar support for K and up.Sascha Haeberling2013-09-182-22/+57
| | | | | | | | | | | | Bug: 10723047 Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
* | am e1f0f4f1: Merge "Delete the captured video if cancel in review." into ↵ztenghui2013-09-171-1/+4
|\| | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc': Delete the captured video if cancel in review.
| * Merge "Delete the captured video if cancel in review." into ↵ztenghui2013-09-181-1/+4
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Delete the captured video if cancel in review.ztenghui2013-09-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | In capture intent case, video get inserted all the time before review. So if cancelled in review mode, the captured video should be deleted. bug:8897671 Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
* | | am 15125661: Fall back to Photo module if stores index is illegal.Sascha Haeberling2013-09-171-8/+7
|\| | | | | | | | | | | | | | * commit '15125661ad968cf4d40989a9bc88d11189beb0b3': Fall back to Photo module if stores index is illegal.
| * | Fall back to Photo module if stores index is illegal.Sascha Haeberling2013-09-171-8/+7
| | | | | | | | | | | | | | | | | | Bug: 10805249 Change-Id: Iace590af34cf646abf7af74b498520d686c04511
* | | am 483d25a2: Merge "Don\'t crash the app if camera is not available." into ↵Sascha Haeberling2013-09-171-0/+3
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '483d25a21058094303b94e44cc67cbd8fecd4bf8': Don't crash the app if camera is not available.
| * | Merge "Don't crash the app if camera is not available." into ↵Sascha Haeberling2013-09-171-0/+3
| |\ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | Don't crash the app if camera is not available.Sascha Haeberling2013-09-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10747001 Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
* | | | am 4ee4d99c: Merge "Adding a simple done handler interface." into ↵Sascha Haeberling2013-09-171-0/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '4ee4d99cfc519847bd8f84aca9ece5d2b6519536': Adding a simple done handler interface.
| * | | Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbadSascha Haeberling2013-09-171-0/+24
| |\ \ \
| | * | | Adding a simple done handler interface.Sascha Haeberling2013-09-161-0/+24
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10747001 Needed by http://ag/360619 Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
* | | | am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into ↵Doris Liu2013-09-171-30/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '9c0492a606ca48dbc3e56b03051ea9242d952e3e': Fix camera controls rotation for secure camera
| * | | Merge "Fix camera controls rotation for secure camera" into ↵Doris Liu2013-09-171-30/+31
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | Fix camera controls rotation for secure cameraDoris Liu2013-09-171-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8878379 Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
* | | | | am c2497d0a: Merge "Show dialog when camera device is not connected." into ↵Angus Kong2013-09-179-103/+265
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'c2497d0a7213a3c105ec312f12b0f8b00347d5e5': Show dialog when camera device is not connected.
| * | | | Merge "Show dialog when camera device is not connected." into ↵Angus Kong2013-09-179-103/+265
| |\ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | Show dialog when camera device is not connected.Angus Kong2013-09-179-103/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* | | | | | am 828c9190: Merge "Use a new Intent to work around issues in framework" ↵ztenghui2013-09-171-6/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '828c9190aafc9b57126f5a4868e5cee922cf9f2c': Use a new Intent to work around issues in framework
| * | | | | Merge "Use a new Intent to work around issues in framework" into ↵ztenghui2013-09-171-6/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | gb-ub-photos-carlsbad
| | * | | Use a new Intent to work around issues in frameworkztenghui2013-09-171-6/+34
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework didn't update the action provider if reusing the intent object. The work around is creating new intents here. bug:10713267 Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
* | | | am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-09-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '53304d6953ff8f09a51c1128b7a0f3921e45b651': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-1735-282/+142
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1635-282/+142
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab05e7410b6829ad7934d71024fee3e1e2d77f8f Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1741-330/+166
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1641-330/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5 Auto-generated-cl: translation import
* | | | | | am 2065e606: Merge "Fix zoom for images with orientation tag" into ↵Doris Liu2013-09-164-14/+66
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '2065e606b68f7e8532317f076c7f688a2093186d': Fix zoom for images with orientation tag
| * | | | | Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbadDoris Liu2013-09-174-14/+66
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix zoom for images with orientation tagDoris Liu2013-09-164-14/+66
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 10780042 Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
* | | | | am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into ↵Angus Kong2013-09-161-29/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '5bee41c6d727c730c7b10fba886862284a489257': Set correct alpha for views in filmstrip.
| * | | | Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-09-171-29/+60
| |\ \ \ \
| | * | | | Set correct alpha for views in filmstrip.Angus Kong2013-09-161-29/+60
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | bug:10713813 Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
* | | | | am 3d91d906: Add HQ and HD strings.Sascha Haeberling2013-09-161-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3d91d906fa288923b0d307f8333af89699303528': Add HQ and HD strings.
| * | | | Add HQ and HD strings.Sascha Haeberling2013-09-161-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 10785988 Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43
* | | | am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" ↵Doris Liu2013-09-161-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'd688c0c31d4287c03b664f6fca5c6498a1e4bd7d': Fix flicker when zooming images smaller than screen
| * | | Merge "Fix flicker when zooming images smaller than screen" into ↵Doris Liu2013-09-161-1/+3
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | Fix flicker when zooming images smaller than screenDoris Liu2013-09-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10733300 Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
* | | | | am c2915695: Avoid expensive O(n) main-thread operation when adding Photo ↵Sascha Haeberling2013-09-162-21/+114
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Sphere. * commit 'c29156954bcbf0218a78c308c3ba8f25e00aeecc': Avoid expensive O(n) main-thread operation when adding Photo Sphere.
| * | | Avoid expensive O(n) main-thread operation when adding Photo Sphere.Sascha Haeberling2013-09-162-21/+114
| | |/ | |/| | | | | | | | | | | | | Bug: 10747001 Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
* | | am d095b79d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
|\| | | | | | | | | | | | | | * commit 'd095b79d083440e20d683ddb05ff8477159ee38f': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-1447-0/+328
| |/ | | | | | | | | Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-1455-0/+384
| | | | | | | | | | Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e Auto-generated-cl: translation import
* | am 44974d4b: Don\'t show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
|\| | | | | | | | | * commit '44974d4b8014ec1f3c8ef1b9d77aae990bbba821': Don't show menu/indicators in wide-angle mode.
| * Don't show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
| | | | | | | | | | | | bug:10674078 Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
* | am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." ↵Sascha Haeberling2013-09-131-2/+4
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25': Fix potential deadlock while rendering the preview.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:03:53 +0000