Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removing unused UI fields in FilterRepresentation. | Ruben Brunk | 2013-06-05 | 27 | -95/+31 |
| | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2 | ||||
* | Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbad | Ruben Brunk | 2013-06-03 | 1 | -3/+36 |
|\ | |||||
| * | Fixes save filename for panos after edit. | Ruben Brunk | 2013-06-03 | 1 | -3/+36 |
| | | | | | | | | | | Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590 | ||||
* | | Add play icon for videos. | Angus Kong | 2013-06-03 | 1 | -6/+22 |
|/ | | | | Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd | ||||
* | am 8bb4e1a0: Fixes reading exif tags in editor. | Ruben Brunk | 2013-06-03 | 1 | -1/+1 |
|\ | | | | | | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor. | ||||
| * | Fixes reading exif tags in editor. | Ruben Brunk | 2013-06-03 | 1 | -1/+1 |
| | | | | | | | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6 | ||||
* | | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad | ztenghui | 2013-06-03 | 2 | -6/+9 |
|\ \ | |||||
| * | | Add LUT3D filter state saving | ztenghui | 2013-05-31 | 2 | -6/+9 |
| | | | | | | | | | | | | Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018 | ||||
* | | | 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 | ||||
* | | | | Merge "Fix mistakenly reversed order in FilmStripView." into ↵ | Angus Kong | 2013-05-31 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad | ||||
| * | | | | Fix mistakenly reversed order in FilmStripView. | Angus Kong | 2013-05-30 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4 | ||||
* / / / | Mirroring google3 for CL 47368174. | Ruben Brunk | 2013-05-30 | 1 | -0/+5 |
|/ / / | | | | | | | | | | Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d | ||||
* | | | 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 | ||||
* | | | | Copy Tiling changes from G+ | John Reck | 2013-05-30 | 5 | -187/+481 |
| |_|/ |/| | | | | | | | | Change-Id: Id229728182a002c29699884289f1354b6cb6e714 | ||||
* | | | Cleaning up ImageShow. | Ruben Brunk | 2013-05-29 | 7 | -217/+25 |
| | | | | | | | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690 | ||||
* | | | Merge "zoom to center of double tap" into gb-ub-photos-carlsbad | John Hoford | 2013-05-29 | 2 | -1/+24 |
|\ \ \ | |||||
| * | | | zoom to center of double tap | John Hoford | 2013-05-28 | 2 | -1/+24 |
| | | | | | | | | | | | | | | | | Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37 | ||||
* | | | | 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 | ||||
* | | | | | Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad | George Mount | 2013-05-28 | 1 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Recover from bitmap decode failure. | George Mount | 2013-05-28 | 1 | -1/+8 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skia errors out when decoding a bitmap into another bitmap sometimes. When this situation is detected, the decode is is retried without reusing a bitmap. Change-Id: I935dec988ed7e115ceda9233a65d3b6083a17468 | ||||
* | | | | | Removed unused ZoomCache class. | Ruben Brunk | 2013-05-28 | 2 | -57/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 Note: this class doesn't appear to have been used by the zoom on doubletap. Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9 | ||||
* | | | | | Removed unused handling for intent extras in editor. | Ruben Brunk | 2013-05-28 | 10 | -315/+44 |
|/ / / / | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Merge "Change the order of exposure compensation" into gb-ub-photos-bryce | Doris Liu | 2013-05-28 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * | | | Change the order of exposure compensation | Doris Liu | 2013-05-24 | 1 | -4/+4 |
| | | |/ | | |/| | | | | | | | | | | | | | Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3 | ||||
* | | | | am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" ↵ | Bobby Georgescu | 2013-05-28 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-bryce * commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e': Prevent lock screen appearing during active slideshow | ||||
| * | | | Merge "Prevent lock screen appearing during active slideshow" into ↵ | Bobby Georgescu | 2013-05-28 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | gb-ub-photos-bryce | ||||
| | * | | Prevent lock screen appearing during active slideshow | Bobby Georgescu | 2013-05-24 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234 | ||||
* | | | | functionality added to transport filter parameter values to following ↵ | Christian Wichner | 2013-05-24 | 2 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3 | ||||
* | | | | 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 a7a6a3a5: Fix issues with Local | John Hoford | 2013-05-23 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local | ||||
| * | | | Fix issues with Local | John Hoford | 2013-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d | ||||
* | | | | am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce | John Hoford | 2013-05-22 | 1 | -4/+21 |
|\| | | | | | | | | | | | | | | | | | | | * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait |