summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Expand)AuthorAgeFilesLines
* Add a layout for undo barDoris Liu2013-06-051-0/+31
* Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
* Add secure camera support.Angus Kong2013-06-031-0/+23
* Merge "Add new camera activity back and fix build errors" into gb-ub-photos-c...Doris Liu2013-05-164-0/+144
|\
| * Add new camera activity back and fix build errorsDoris Liu2013-05-164-0/+144
* | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-161-1/+2
|\ \
| * \ Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-161-1/+2
| |\ \
| | * | toUpper() some stringsJohn Reck2013-05-161-1/+2
* | | | am fef58a0f: change edit iconJohn Hoford2013-05-161-1/+1
|\| | | | |_|/ |/| |
| * | change edit iconJohn Hoford2013-05-161-1/+1
| |/
* | Remove new camera activity to avoid build breakageDoris Liu2013-05-085-201/+0
* | am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-082-101/+101
|\|
| * Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-082-101/+101
| |\
| | * Fix second level menuMichael Kolb2013-05-082-101/+101
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-088-299/+0
| |/
* | Quick and Dirty build fixMichael Kolb2013-05-061-0/+57
* | am 08d2c513: Merge "Fix black background on save progress indicator." into gb...George Mount2013-05-061-1/+1
|\|
| * 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
* | | am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryceMichael Kolb2013-05-062-18/+25
|\| |
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-062-18/+25
| |/
* | am 00259461: Fix UInicolasroard2013-05-015-8/+12
|\|
| * Fix UInicolasroard2013-05-015-8/+12
* | am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-011-3/+1
|\|
| * Fix layout and preview for tabletsMichael Kolb2013-05-011-3/+1
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-011-1/+2
|\|
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-291-1/+2
* | am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-261-18/+25
|\|
| * Add new indicatorsMichael Kolb2013-04-261-18/+25
| * Remove new camera activity code from BryceDoris Liu2013-04-254-144/+0
|/
* UI changesnicolasroard2013-04-248-343/+287
* Fix local adjustJohn Hoford2013-04-231-1/+13
* New state panelnicolasroard2013-04-151-0/+47
* Merge "Show loading indicator in full-screen importer view" into gb-ub-photos...Bobby Georgescu2013-04-111-2/+9
|\
| * Show loading indicator in full-screen importer viewBobby Georgescu2013-04-111-2/+9
* | Merge "Integrate FilmStripView." into gb-ub-photos-bryceAngus Kong2013-04-112-4/+30
|\ \ | |/ |/|
| * Integrate FilmStripView.Angus Kong2013-04-112-4/+30
* | 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
* | Merge "Implements swipe in editor menu" into gb-ub-photos-brycenicolasroard2013-04-091-1/+2
|\ \
| * | Implements swipe in editor menunicolasroard2013-04-091-1/+2
* | | Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-b...Ruben Brunk2013-04-091-0/+55
|\ \ \ | |/ / |/| |
| * | Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-091-0/+55
* | | Merge "ui cleanup" into gb-ub-photos-bryceJohn Hoford2013-04-094-16/+21
|\ \ \ | |_|/ |/| |
| * | ui cleanupJohn Hoford2013-04-094-16/+21
* | | Work in progress - Put preview in TextureViewDoris Liu2013-04-093-0/+118
|/ /
* | Fix history original imagenicolasroard2013-04-091-0/+2
* | Fix positioning of cancel/done buttonsnicolasroard2013-04-081-8/+7
* | make basic editor based on ParametricEditorJohn Hoford2013-04-081-0/+38
|/
* Improve black bar to keep camera controls in placeDoris Liu2013-04-031-2/+3