summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * New count down beeps.Doris Liu2013-05-132-0/+0
| | | | | | | | | | | | | | | Bug: 8872947 Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
* | | resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbadztenghui2013-05-091-3/+8
|\| | | | | | | | | | | Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
| * | Merge "Fix the verbose log" into gb-ub-photos-bryceztenghui2013-05-091-3/+8
| |\ \
| | * | Fix the verbose logztenghui2013-05-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
* | | | am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-084-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49': Add drop shadow to preview thumb
| * | | Add drop shadow to preview thumbMichael Kolb2013-05-084-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
* | | Remove new camera activity to avoid build breakageDoris Liu2013-05-086-559/+0
| | | | | | | | | | | | Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
* | | am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0841-121/+101
|\| | | | | | | | | | | | | | * commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706': Fix second level menu
| * | Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0841-121/+101
| |\ \ | | |/ | |/|
| | * Fix second level menuMichael Kolb2013-05-0841-121/+101
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
* | | am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into ↵Angus Kong2013-05-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '188ad6eda97b4e05853d582198722e70f9e03705': DO NOT MERGE Further assets clean up.
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-0821-299/+0
| |/ | | | | | | | | | | | | Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
* | am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-07183-0/+0
|\| | | | | | | | | * commit '9a26f823b2894d3decf47b28ee10d08932b09adf': Remove unused assets
| * Merge "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-08183-0/+0
| |\
| | * Remove unused assetsMichael Kolb2013-05-07183-0/+0
| | | | | | | | | | | | | | | | | | Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
* | | am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." ↵Sascha Haeberling2013-05-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-bryce * commit '6febbfc6c9c2d645f22fb200574fe14fa1201046': Avoid rounding errors from cropping uncropped images.
| * | Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-071-1/+1
| |/ | | | | | | | | | | | | | | Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
* | Quick and Dirty build fixMichael Kolb2013-05-061-0/+57
| | | | | | | | Change-Id: I4266fa63145a95d878a9fc0effab937ec0859bab
* | am 08d2c513: Merge "Fix black background on save progress indicator." into ↵George Mount2013-05-061-1/+1
|\| | | | | | | | | | | | | gb-ub-photos-bryce * commit '08d2c51392978383699aedcf63d24e5122b3b7a5': Fix black background on save progress indicator.
| * Merge "Fix black background on save progress indicator." into gb-ub-photos-bryceGeorge Mount2013-05-061-1/+1
| |\
| | * Fix black background on save progress indicator.George Mount2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | Bug 8802092 Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
* | | am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryceMichael Kolb2013-05-064-65/+75
|\| | | | | | | | | | | | | | * commit 'ea75136ae4abf55070644e5a048cf44323517c43': Fix lockscreen camera widget layout
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-064-65/+75
| |/ | | | | | | | | | | Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
* | am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-040-0/+0
|\| | | | | | | | | | | | | gb-ub-photos-bryce * commit '49a242256761f990001c3f81c54e4897f58ebc36': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-031-1/+1
| | | | | | | | | | Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb Auto-generated-cl: translation import
* | am 00259461: Fix UInicolasroard2013-05-017-14/+22
|\| | | | | | | | | * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
| * Fix UInicolasroard2013-05-017-14/+22
| | | | | | | | | | bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
* | am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-017-50/+8
|\| | | | | | | | | * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
| * Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-017-50/+8
| |\
| | * Fix layout and preview for tabletsMichael Kolb2013-05-017-50/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
* | | am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '32aa7da8dc533a5add4ca7c94a69201ff5ed9a90': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-012-2/+2
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2013-05-012-2/+2
| | | | | | | | | | | | | | | Change-Id: I7a4b256e2ef8d9eea311c8945be7caa93ff5609c Auto-generated-cl: translation import
* | | am c43e5b6b: Update capture animationMichael Kolb2013-05-016-1/+54
|\| | | | | | | | | | | | | | * commit 'c43e5b6bd84f5a7635766f70677097f6958f4058': Update capture animation
| * | Update capture animationMichael Kolb2013-05-016-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
* | | am 03e752e0: Update scene mode off icon in menuMichael Kolb2013-05-011-1/+1
|\| | | | | | | | | | | | | | * commit '03e752e0c9f9978663fb5bca06edd5e56476132e': Update scene mode off icon in menu
| * | Update scene mode off icon in menuMichael Kolb2013-05-011-1/+1
| |/ | | | | | | | | | | Bug: 8656593 Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc
* | am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-010-0/+0
|\| | | | | | | | | | | | | gb-ub-photos-bryce * commit 'aa3541c5f8e64f6f6cf7d5c80f1aeaacde51a4f0': Import translations. DO NOT MERGE
| * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-303-8/+5
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-04-303-8/+5
| | | | | | | | | | | | | | | Change-Id: Ie7162610e7c9c69d5d5e70d552f9c8bece66cefa Auto-generated-cl: translation import
* | | am 9ce3bef0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-010-0/+0
|\| | | | | | | | | | | | | | * commit '9ce3bef0a877c5573256ea8a76642e45dac92cc4': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-302-20/+11
| |/ | | | | | | | | Change-Id: I03986a2e5f9465f377739c18d672574c34464960 Auto-generated-cl: translation import
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-019-3/+5
|\| | | | | | | Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-299-3/+5
| | | | | | | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* | Modifications for simple editnicolasroard2013-04-294-17/+47
| | | | | | | | Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
* | am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
|\| | | | | | | | | * commit '9e5b079934538f2c90d0ac995330fb006b738cc7': Cleanup crop activity UI.
| * Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
| |\
| | * Cleanup crop activity UI.Ruben Brunk2013-04-262-1/+3
| | | | | | | | | | | | | | | | | | | | | Bug: 8734193 Bug: 8723843 Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
* | | am 45377ce9: Merge "Log name of borders and filters of saved images" into ↵Bobby Georgescu2013-04-261-0/+9
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '45377ce902eb0dce6fb6b1e58925654822e25a19': Log name of borders and filters of saved images
| * | Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryceBobby Georgescu2013-04-261-0/+9
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:07:48 +0000