summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Fix second level menuMichael Kolb2013-05-0841-121/+101
| | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
* Remove unused assetsMichael Kolb2013-05-07183-0/+0
| | | | | | Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
* 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
* | 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
* Fix UInicolasroard2013-05-015-8/+12
| | | | | bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
* 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
* | Update capture animationMichael Kolb2013-05-016-1/+54
| | | | | | | | | | | | | | | | | | Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
* | 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
* small ui changes based on UX/PM feedbackJohn Hoford2013-04-297-1/+2
| | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* 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
* | 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
|\ \ | |/ |/|
| * Remove new camera activity code from BryceDoris Liu2013-04-254-144/+0
| | | | | | | | | | Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2513-72/+205
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2513-72/+205
| |/ | | | | | | | | Change-Id: Ief67e6650c12d3db1f6bd82f4bf22b8f2a580078 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBaligh Uddin2013-04-2512-216/+108
|/ | | | | Change-Id: I53653ac2d7e1228f4aecedcb2831b4f037a85b99 Auto-generated-cl: translation import
* Merge "UI changes" into gb-ub-photos-brycenicolasroard2013-04-2526-487/+743
|\
| * UI changesnicolasroard2013-04-2426-487/+743
| | | | | | | | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* | New capture animationMichael Kolb2013-04-242-0/+4
|/ | | | | | | | | Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
* Merge "Fix local adjust" into gb-ub-photos-bryceJohn Hoford2013-04-2414-1/+13
|\
| * Fix local adjustJohn Hoford2013-04-2314-1/+13
| | | | | | | | | | bug:8655977 Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-241-6/+3
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-241-6/+3
| |/ | | | | | | | | Change-Id: I8cd5a603a76b616df7a2bc1cb8b8ae0db4f2d5ee Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBaligh Uddin2013-04-248-29/+20
|/ | | | | Change-Id: I0034c392392c3f822a5945d84dcd2a958d147970 Auto-generated-cl: translation import
* Merge "Fix wallpaper crop UI." into gb-ub-photos-bryceRuben Brunk2013-04-221-0/+2
|\
| * Fix wallpaper crop UI.Ruben Brunk2013-04-221-0/+2
| | | | | | | | | | Bug: 8687759 Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2248-286/+386
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2248-286/+386
| | | | | | | | | | | | | | | Change-Id: I29d0fd49904f33631aeb4f77e1e0174186d99e88 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2249-1763/+2025
|\ \ \ | |_|/ |/| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2249-1763/+2025
| |/ | | | | | | | | Change-Id: I5792f361b2f301c4acf5ef80fd33d149acc081dd Auto-generated-cl: translation import
* / More menu fixesMichael Kolb2013-04-221-2/+2
|/ | | | | | | | | Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
* Strings updatenicolasroard2013-04-191-4/+4
| | | | | bug:8664728 Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9
* Merge "String updates." into gb-ub-photos-bryceNicolas Roard2013-04-201-2/+5
|\
| * String updates.Ruben Brunk2013-04-191-2/+5
| | | | | | | | | | Bug: 8664728 Change-Id: Idc23ab0d75a9f1656c5e38a0b0e318a63d6875b5
* | Rename scenemode AUTO to NONEMichael Kolb2013-04-191-1/+1
|/ | | | | | Bug: 8660834 Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
* Fix labelsMichael Kolb2013-04-192-13/+33
| | | | | | Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a