summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Fix text size in the state panelnicolasroard2013-06-101-0/+4
| | | | Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
* Add a layout for undo barDoris Liu2013-06-052-2/+34
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
|\ | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * Add HTC One picture resolutionsMichael Kolb2013-05-302-0/+8
| | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
* | Cleaning up ImageShow.Ruben Brunk2013-05-292-59/+49
| | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | Add UI for insertion in FilmStripView.Angus Kong2013-05-281-0/+1
| | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
* | am 461e101f: Add 13MP resolutionMichael Kolb2013-05-242-0/+4
|\| | | | | | | | | * commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
| * Add 13MP resolutionMichael Kolb2013-05-242-0/+4
| | | | | | | | | | | | Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
* | Merge "Make preview size smaller so that low-res images come in faster." ↵George Mount2013-05-211-1/+1
|\ \ | | | | | | | | | into gb-ub-photos-carlsbad
| * | Make preview size smaller so that low-res images come in faster.George Mount2013-05-211-1/+1
| | | | | | | | | | | | Change-Id: I82fea176a2aa8b0a3abfd829c0ec2d16f267ef5b
* | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
|\ \ \ | |/ / |/| / | |/ | | * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
| * Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
| | | | | | | | | | | | Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
* | am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-081-0/+1
|\| | | | | | | | | * commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49': Add drop shadow to preview thumb
| * Add drop shadow to preview thumbMichael Kolb2013-05-081-0/+1
| | | | | | | | | | | | | | | | Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
* | am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-011-0/+1
|\| | | | | | | | | * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
| * Fix layout and preview for tabletsMichael Kolb2013-05-011-0/+1
| | | | | | | | | | | | | | | | Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
* | 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 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-261-0/+8
|\| | | | | | | | | | | | | | * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
| * | Add new indicatorsMichael Kolb2013-04-261-0/+8
| |/ | | | | | | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-256-5/+40
|\| | | | | | | Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
| * Merge "UI changes" into gb-ub-photos-brycenicolasroard2013-04-256-5/+40
| |\
| | * UI changesnicolasroard2013-04-246-5/+40
| | | | | | | | | | | | | | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* | | am 474c2273: Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-241-0/+3
|\| | | | | | | | | | | | | | * commit '474c2273f02b2333e0bed22fa40918a0939b5a69': New capture animation
| * | New capture animationMichael Kolb2013-04-241-0/+3
| |/ | | | | | | | | | | | | | | | | Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
* | am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryceRuben Brunk2013-04-221-0/+2
|\| | | | | | | | | * commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2': Fix wallpaper crop UI.
| * Fix wallpaper crop UI.Ruben Brunk2013-04-221-0/+2
| | | | | | | | | | Bug: 8687759 Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
* | am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryceMichael Kolb2013-04-221-2/+2
|\| | | | | | | | | * commit '608f7c9843f48aeccc1678622dc3327958150c31': More menu fixes
| * More menu fixesMichael Kolb2013-04-221-2/+2
| | | | | | | | | | | | | | | | | | Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
* | am d97733b2: Strings updatenicolasroard2013-04-221-4/+4
|\| | | | | | | | | * commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746': Strings update
| * Strings updatenicolasroard2013-04-191-4/+4
| | | | | | | | | | bug:8664728 Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9
* | am bb894c4f: Merge "String updates." into gb-ub-photos-bryceNicolas Roard2013-04-221-2/+5
|\| | | | | | | | | * commit 'bb894c4f321b27ede8e97c42117973376bbaf32f': String updates.
| * 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
* | | am 237216ee: Rename scenemode AUTO to NONEMichael Kolb2013-04-221-1/+1
|\| | | | | | | | | | | | | | * commit '237216eeba5c05d63aa075ac8dc4af423044f302': Rename scenemode AUTO to NONE
| * | Rename scenemode AUTO to NONEMichael Kolb2013-04-191-1/+1
| |/ | | | | | | | | | | Bug: 8660834 Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
* | am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryceMichael Kolb2013-04-222-13/+33
|\| | | | | | | | | * commit 'beba6b1c36f79aded98f71dbf45454dd947ce7b8': Fix labels
| * Fix labelsMichael Kolb2013-04-192-13/+33
| | | | | | | | | | | | Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
* | am 5b083f89: Add more menu options/iconsMichael Kolb2013-04-182-4/+45
|\| | | | | | | | | * commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be': Add more menu options/icons
| * Add more menu options/iconsMichael Kolb2013-04-182-4/+45
| | | | | | | | | | | | | | | | | | Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
* | am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." ↵George Mount2013-04-181-1/+1
|\| | | | | | | | | | | | | into gb-ub-photos-bryce * commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5': Change labels so that it doesn't clash with PanoUiLib.
| * Merge "Change labels so that it doesn't clash with PanoUiLib." into ↵George Mount2013-04-181-1/+1
| |\ | | | | | | | | | gb-ub-photos-bryce
| | * Change labels so that it doesn't clash with PanoUiLib.George Mount2013-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
* | | am c3178ca4: Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-182-0/+39
|\| | | | | | | | | | | | | | * commit 'c3178ca4daf7ed570f3432f3433959c208ecc105': Gallery crop uses new activity. Fixed image quality.
| * | Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-182-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
* | | Merge "Support for save state in images" into gb-ub-photos-carlsbadJohn Hoford2013-04-181-0/+2
|\ \ \ | |/ / |/| |
| * | Support for save state in imagesJohn Hoford2013-04-171-0/+2
| | | | | | | | | | | | | | | | | | bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7