| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Disable zoom when camera does not support zoom" into ↵ | Doris Liu | 2013-06-11 | 5 | -2/+19 |
| |\ | | | | | | | gb-ub-photos-carlsbad | ||||
| | * | Disable zoom when camera does not support zoom | Doris Liu | 2013-06-11 | 5 | -2/+19 |
| | | | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0 | ||||
| * | | Fix build. | Angus Kong | 2013-06-11 | 1 | -1/+1 |
| | | | | | | | | | Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7 | ||||
| * | | Use setPreviewFpsRange instead. | Angus Kong | 2013-06-11 | 3 | -5/+23 |
| |/ | | | | Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a | ||||
| * | Add enable/disable swiping to filmstrip | Doris Liu | 2013-06-06 | 7 | -11/+27 |
| | | | | | Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29 | ||||
| * | Merge "Play video from flim strip." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-05 | 5 | -26/+63 |
| |\ | |||||
| | * | Play video from flim strip. | Angus Kong | 2013-06-04 | 5 | -26/+63 |
| | | | | | | | | | Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f | ||||
| * | | Add interface for swipe checking. | Angus Kong | 2013-06-05 | 3 | -0/+22 |
| |/ | | | | | | And fullscreen notification. Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833 | ||||
| * | Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-04 | 6 | -178/+122 |
| |\ | |||||
| | * | Get new camera activity up to date | Doris Liu | 2013-06-03 | 6 | -178/+122 |
| | | | | | | | | | Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37 | ||||
| * | | Fix pie menu button disappearing | Doris Liu | 2013-06-03 | 1 | -1/+1 |
| | | | | | | | | | Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb | ||||
| * | | Merge "Add secure camera support." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-04 | 3 | -42/+139 |
| |\ \ | |||||
| | * | | Add secure camera support. | Angus Kong | 2013-06-03 | 3 | -42/+139 |
| | |/ | | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c | ||||
| * / | Add play icon for videos. | Angus Kong | 2013-06-03 | 1 | -6/+22 |
| |/ | | | | Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd | ||||
| * | Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-03 | 7 | -77/+73 |
| |\ | |||||
| | * | Add recent changes to new photo module | Doris Liu | 2013-05-31 | 7 | -77/+73 |
| | | | | | | | | | Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d | ||||
| * | | Add newly taken photos/videos to film strip. | Angus Kong | 2013-05-31 | 4 | -4/+61 |
| |/ | | | | Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd | ||||
| * | Merge "Adjust data id even if it's not currently used." into ↵ | Angus Kong | 2013-05-31 | 1 | -5/+11 |
| |\ | | | | | | | gb-ub-photos-carlsbad | ||||
| | * | Adjust data id even if it's not currently used. | Angus Kong | 2013-05-30 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | FilmStripView should adjust the internal info of data id after removal regardless of the existence of the removed data in the buffer. Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf | ||||
| * | | Improve gesture handling | Doris Liu | 2013-05-31 | 9 | -237/+137 |
| | | | | | | | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98 | ||||
| * | | Merge "Translate the first/last view too." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-31 | 1 | -5/+9 |
| |\ \ | |||||
| | * | | Translate the first/last view too. | Angus Kong | 2013-05-30 | 1 | -5/+9 |
| | |/ | | | | | | | Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0 | ||||
| * | | Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-31 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Don't use the same drawable for every view. | Angus Kong | 2013-05-30 | 1 | -1/+2 |
| | |/ | | | | | | | | | | | The placeholder drawable should be cloned for each view using it. Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7 | ||||
| * / | Fix mistakenly reversed order in FilmStripView. | Angus Kong | 2013-05-30 | 1 | -2/+2 |
| |/ | | | | Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4 | ||||
| * | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce | Michael Kolb | 2013-05-30 | 1 | -2/+23 |
| |\ | | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions | ||||
| | * | Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce | Michael Kolb | 2013-05-30 | 1 | -2/+23 |
| | |\ | |||||
| | | * | Add HTC One picture resolutions | Michael Kolb | 2013-05-30 | 1 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8 | ||||
| * | | | am a1db2653: Dismiss settings when showing popup in Video mode. | Angus Kong | 2013-05-30 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode. | ||||
| | * | | Dismiss settings when showing popup in Video mode. | Angus Kong | 2013-05-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7 | ||||
| * | | | Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-29 | 2 | -37/+138 |
| |\ \ \ | |||||
| | * | | | Add UI for insertion in FilmStripView. | Angus Kong | 2013-05-28 | 2 | -37/+138 |
| | | | | | | | | | | | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a | ||||
| * | | | | Removed unused handling for intent extras in editor. | Ruben Brunk | 2013-05-28 | 2 | -3/+4 |
| |/ / / | | | | | | | | | | | | | Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687 | ||||
| * | | | am 9fb962fe: Merge "Change the order of exposure compensation" into ↵ | Doris Liu | 2013-05-28 | 1 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation | ||||
| | * | | Change the order of exposure compensation | Doris Liu | 2013-05-24 | 1 | -4/+4 |
| | |/ | | | | | | | | | Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3 | ||||
| * | | Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-23 | 1 | -9/+11 |
| |\ \ | |||||
| | * | | Fix/simplify comparator of LocalData. | Angus Kong | 2013-05-23 | 1 | -9/+11 |
| | | | | | | | | | | | | | Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef | ||||
| * | | | Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-23 | 1 | -83/+122 |
| |\ \ \ | |||||
| | * | | | Refactor to add FilmStripView.Controller. | Angus Kong | 2013-05-22 | 1 | -83/+122 |
| | |/ / | | | | | | | | | | | | | | | | Use controller to control the FilmStripView. Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9 | ||||
| * | | | am 80a3d636: Make capture thumbnail tappable in video mode. | Sascha Haeberling | 2013-05-22 | 3 | -1/+37 |
| |\ \ \ | |/ / |/| / | |/ | | | * commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d': Make capture thumbnail tappable in video mode. | ||||
| | * | Make capture thumbnail tappable in video mode. | Sascha Haeberling | 2013-05-21 | 3 | -1/+37 |
| | | | | | | | | | | | | | | | | | Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc | ||||
| * | | Keep camera preview in view hierarchy. | Angus Kong | 2013-05-21 | 1 | -5/+29 |
| | | | | | | | | | | | | | | | Camera preview is a special case that needs to be kept to avoid unnecessary start and stop preview. Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e | ||||
| * | | Fix off-position issue after changing orientation | Angus Kong | 2013-05-21 | 1 | -93/+100 |
| | | | | | | | | | Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8 | ||||
| * | | Fix jitter in FilmStripView. | Angus Kong | 2013-05-20 | 1 | -14/+51 |
| | | | | | | | | | | | | | | | The jigger happens when deleting the one before the last. The length of the film strip might be changed due to the deletion. Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1 | ||||
| * | | Add remove UI in FilmStripView | Angus Kong | 2013-05-16 | 5 | -58/+257 |
| | | | | | | | | | | | | | | | 1. Add UI support for swipe to delete. 2. Don't set children padding. Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c | ||||
| * | | Add new camera activity back and fix build errors | Doris Liu | 2013-05-16 | 12 | -3/+7226 |
| | | | | | | | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0 | ||||
| * | | am 655e208d: Merge "Correct label position after rotation" into ↵ | Michael Kolb | 2013-05-15 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | gb-ub-photos-bryce * commit '655e208d5dc1305d9e4eb5301dec0673136151c9': Correct label position after rotation | ||||
| | * | Merge "Correct label position after rotation" into gb-ub-photos-bryce | Michael Kolb | 2013-05-15 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Correct label position after rotation | Michael Kolb | 2013-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Bug: 8963421 Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3 | ||||
| * | | | Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-15 | 3 | -356/+524 |
| |\ \ \ | |||||
 |
index : android_packages_apps_Snap | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |