summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Fix icon sizes and jaggiesnicolasroard2013-06-114-2/+19
| | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Fix text size in the state panelnicolasroard2013-06-101-0/+4
| | | | Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
* Add a layout for undo barDoris Liu2013-06-053-2/+65
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
| | | | Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
* Add secure camera support.Angus Kong2013-06-031-0/+23
| | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* Improve gesture handlingDoris Liu2013-05-312-0/+2
| | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
* 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
| * Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
| |\
| | * 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
| * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2749-0/+79
| |/ | | | | | | | | Change-Id: I6d43e9331dd993de57921360e33c36a58c355056 Auto-generated-cl: translation import
* | 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 "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-171-6/+6
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-05-171-6/+6
| | | | | | | | | | | | | | | Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52 Auto-generated-cl: translation import
* | | 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
* | | Merge "Add new camera activity back and fix build errors" into ↵Doris Liu2013-05-164-0/+144
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-164-0/+144
| | | | | | | | | | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
* | | am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into ↵Michael Kolb2013-05-168-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
| * | Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryceMichael Kolb2013-05-168-0/+0
| |\ \
| | * | Add new overlay icons for sharpen and curvesMichael Kolb2013-05-168-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
* | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
| * | | 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