summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
| |\ \ \
| | * | | toUpper() some stringsJohn Reck2013-05-162-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | | / am fef58a0f: change edit iconJohn Hoford2013-05-164-1/+1
|\| | | | |_|/ |/| | | | | | | | * commit 'fef58a0fc969cc09b02cb9945da8d553698681e3': change edit icon
| * | change edit iconJohn Hoford2013-05-164-1/+1
| |/ | | | | | | | | bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
* | am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\| | | | | | | | | * commit '25d69c11831fabf8f4e474aaf17b05dd001979ce': New count down beeps.
| * Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
| |\
| | * New count down beeps.Doris Liu2013-05-132-0/+0
| | | | | | | | | | | | | | | Bug: 8872947 Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
* | | 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-085-201/+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
| * | 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
| * Remove unused assetsMichael Kolb2013-05-07183-0/+0
| | | | | | | | | | | | Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
* | 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
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-031-1/+1
| | | | | | | | | | Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb Auto-generated-cl: translation import
* | am 00259461: Fix UInicolasroard2013-05-015-8/+12
|\| | | | | | | | | * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
| * Fix UInicolasroard2013-05-015-8/+12
| | | | | | | | | | 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
| * | 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
| * 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
| * | 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-017-1/+2
|\| | | | | | | Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-297-1/+2
| | | | | | | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* | 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 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
|\| | | | | | | | | | | | | | * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
| * | Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
| |\ \
| | * | Add new indicatorsMichael Kolb2013-04-26173-24/+39
| | |/ | | | | | | | | | | | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2635-373/+102
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2635-373/+102
| | | | | | | | | | | | | | | | | | | | Change-Id: I638990d511e9c7186d7a6096a9d7308cccbaf9b3 Auto-generated-cl: translation import
| * | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2635-614/+308
| |\ \ \ | | |_|/ | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2635-614/+308
| | |/ | | | | | | | | | | | | Change-Id: I5d5299a773df9f8bf62e3057f626d414569989fb Auto-generated-cl: translation import
| * | Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryceDoris Liu2013-04-264-144/+0
| |\ \ | | |/ | |/|