summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Add quality selector to export.Ruben Brunk2013-08-021-0/+80
| | | | | | | - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
* Hide "View Photo Sphere" button by default.Sascha Haeberling2013-08-011-0/+1
| | | | Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
* Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-011-5/+25
| | | | | | | | | | | This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
* Add user presets saving/loadingnicolasroard2013-07-302-0/+117
| | | | Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
* add Grad filterJohn Hoford2013-07-292-0/+77
| | | | Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
* Remove FilterIconButtonnicolasroard2013-07-031-18/+0
| | | | Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
* Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-211-23/+0
|\
| * Remove SRI panoramaDoris Liu2013-06-201-23/+0
| | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | Add flash animation to photo moduleDoris Liu2013-06-191-0/+7
|/ | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* Switch over to use new camera activityDoris Liu2013-06-186-167/+40
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Fix icon sizes and jaggiesnicolasroard2013-06-111-2/+2
| | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Add a layout for undo barDoris Liu2013-06-051-0/+31
| | | | 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
* 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 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-161-1/+2
|\ \ | | | | | | | | | | | | * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
| * \ Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-161-1/+2
| |\ \
| | * | toUpper() some stringsJohn Reck2013-05-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | | | am fef58a0f: change edit iconJohn Hoford2013-05-161-1/+1
|\| | | | |_|/ |/| | | | | | | | * commit 'fef58a0fc969cc09b02cb9945da8d553698681e3': change edit icon
| * | change edit iconJohn Hoford2013-05-161-1/+1
| |/ | | | | | | | | bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
* | 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-082-101/+101
|\| | | | | | | | | * commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706': Fix second level menu
| * Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-082-101/+101
| |\
| | * Fix second level menuMichael Kolb2013-05-082-101/+101
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-088-299/+0
| |/ | | | | | | | | | | | | Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
* | 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-062-18/+25
|\| | | | | | | | | | | | | | * commit 'ea75136ae4abf55070644e5a048cf44323517c43': Fix lockscreen camera widget layout
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-062-18/+25
| |/ | | | | | | | | | | Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
* | 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-011-3/+1
|\| | | | | | | | | * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
| * Fix layout and preview for tabletsMichael Kolb2013-05-011-3/+1
| | | | | | | | | | | | | | | | Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-011-1/+2
|\| | | | | | | Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-291-1/+2
| | | | | | | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* | am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-261-18/+25
|\| | | | | | | | | * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
| * Add new indicatorsMichael Kolb2013-04-261-18/+25
| | | | | | | | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
| * Remove new camera activity code from BryceDoris Liu2013-04-254-144/+0
|/ | | | | Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
* UI changesnicolasroard2013-04-248-343/+287
| | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* Fix local adjustJohn Hoford2013-04-231-1/+13
| | | | | bug:8655977 Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
* New state panelnicolasroard2013-04-151-0/+47
| | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* Merge "Show loading indicator in full-screen importer view" into ↵Bobby Georgescu2013-04-111-2/+9
|\ | | | | | | gb-ub-photos-bryce
| * Show loading indicator in full-screen importer viewBobby Georgescu2013-04-111-2/+9
| | | | | | | | | | Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
* | Merge "Integrate FilmStripView." into gb-ub-photos-bryceAngus Kong2013-04-112-4/+30
|\ \ | |/ |/|
| * Integrate FilmStripView.Angus Kong2013-04-112-4/+30
| | | | | | | | Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
* | Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryceBobby Georgescu2013-04-101-1/+1
|\ \ | |/ |/|
| * Correctly scale images in MTP importerBobby Georgescu2013-04-101-1/+1
| | | | | | | | | | Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4