summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryceDoris Liu2013-04-265-502/+0
|\
| * Remove new camera activity code from BryceDoris Liu2013-04-255-502/+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-2527-487/+762
|\
| * UI changesnicolasroard2013-04-2427-487/+762
| | | | | | | | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* | Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-242-0/+4
|\ \
| * | 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 for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-241-0/+5
|\ \ | |/ |/|
| * Fix for popuping being hard to dismissDoris Liu2013-04-231-0/+5
| | | | | | | | | | Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
* | Fix CurvesJohn Hoford2013-04-241-3/+30
| | | | | | | | | | bug:8710572 Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
* | 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
* | interruptible rendererJohn Hoford2013-04-232-0/+13
| | | | | | | | | | bug:8632908 Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
* | 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
* | Merge "More menu fixes" into gb-ub-photos-bryceMichael Kolb2013-04-221-2/+2
|\ \
| * | More menu fixesMichael Kolb2013-04-221-2/+2
| |/ | | | | | | | | | | | | | | | | Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
* / Fix for camera switcher hard to hitDoris Liu2013-04-201-0/+8
|/ | | | | Bug: 8667079 Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
* 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
* tiny planet fixJohn Hoford2013-04-192-0/+43
| | | | | bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
* Fix labelsMichael Kolb2013-04-192-13/+33
| | | | | | Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
* Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryceDoris Liu2013-04-193-6/+35
|\
| * Allow swiping to filmstrip from blocker barDoris Liu2013-04-183-6/+35
| | | | | | | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
* | Drop in new assets of correct sizeMichael Kolb2013-04-19102-0/+0
| | | | | | | | | | | | Bug: 8640131 Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7
* | Add more menu options/iconsMichael Kolb2013-04-183-6/+53
| | | | | | | | | | | | | | | | | | Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
* | Merge "Change labels so that it doesn't clash with PanoUiLib." into ↵George Mount2013-04-183-9/+9
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Change labels so that it doesn't clash with PanoUiLib.George Mount2013-04-183-9/+9
| | | | | | | | | | | | | | | | | | | | | Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
* | | Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-183-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-1848-96/+188
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-1748-96/+188
| | | | | | | | | | | | | | | | | | | | Change-Id: I40c3456be1b6c6cecda7cc3c8c819972c7e42c6b Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-1849-7/+1927
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-1749-7/+1927
| |/ / | | | | | | | | | | | | Change-Id: Ibddba812775d4c197ceab7640c2f1bfce26eb4b3 Auto-generated-cl: translation import
* | | First part of asset dropMichael Kolb2013-04-17103-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
* | | Add accessibility to video player controller.ztenghui2013-04-171-0/+9
|/ / | | | | | | | | | | | | | | | | bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
* / Remove History panelnicolasroard2013-04-162-10/+0
|/ | | | | | | | | | | | Now that we have the state, history is not that useful. For clarity's sake we are removing it. bug:8620913 bug:8503386 bug:8324322 bug:8324023 Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
* New state panelnicolasroard2013-04-154-63/+110
| | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-161-0/+2
|\
| * Angle menu at edge of screenMichael Kolb2013-04-151-0/+2
| | | | | | | | | | | | | | | | Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3