summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
|\ \ \ | | |/ | |/| | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * | Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
| |\ \
| | * | Add HTC One picture resolutionsMichael Kolb2013-05-301-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 Kong2013-05-301-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
| * | | Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
* | | | Copy Tiling changes from G+John Reck2013-05-305-187/+481
| |_|/ |/| | | | | | | | Change-Id: Id229728182a002c29699884289f1354b6cb6e714
* | | Cleaning up ImageShow.Ruben Brunk2013-05-297-217/+25
| | | | | | | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | | Merge "zoom to center of double tap" into gb-ub-photos-carlsbadJohn Hoford2013-05-292-1/+24
|\ \ \
| * | | zoom to center of double tapJohn Hoford2013-05-282-1/+24
| | | | | | | | | | | | | | | | Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
* | | | Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbadAngus Kong2013-05-292-37/+138
|\ \ \ \
| * | | | Add UI for insertion in FilmStripView.Angus Kong2013-05-282-37/+138
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
* | | | | Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbadGeorge Mount2013-05-281-1/+8
|\ \ \ \ \
| * | | | | Recover from bitmap decode failure.George Mount2013-05-281-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 Brunk2013-05-282-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 Brunk2013-05-2810-315/+44
|/ / / / | | | | | | | | | | | | | | | | Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
* | | | am 9fb962fe: Merge "Change the order of exposure compensation" into ↵Doris Liu2013-05-281-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-bryceDoris Liu2013-05-281-4/+4
| |\ \ \
| | * | | Change the order of exposure compensationDoris Liu2013-05-241-4/+4
| | | |/ | | |/| | | | | | | | | | | | | Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
* | | | am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" ↵Bobby Georgescu2013-05-281-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 Georgescu2013-05-281-2/+1
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-bryce
| | * | Prevent lock screen appearing during active slideshowBobby Georgescu2013-05-241-2/+1
| | | | | | | | | | | | | | | | | | | | Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234
* | | | functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-242-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-carlsbadAngus Kong2013-05-231-9/+11
|\ \ \ \
| * | | | Fix/simplify comparator of LocalData.Angus Kong2013-05-231-9/+11
| | |_|/ | |/| | | | | | | | | | Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef
* | | | Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbadAngus Kong2013-05-231-83/+122
|\ \ \ \
| * | | | Refactor to add FilmStripView.Controller.Angus Kong2013-05-221-83/+122
| |/ / / | | | | | | | | | | | | | | | | | | | | Use controller to control the FilmStripView. Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
* | | | am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
| * | | Fix issues with LocalJohn Hoford2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
* | | | am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
|\| | | | | | | | | | | | | | | | | | | * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait
| * | | Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
| |\ \ \
| | * | | fix ellipse logic for portraitJohn Hoford2013-05-211-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | bug:9054114 Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
* | | | | am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into ↵Bobby Georgescu2013-05-221-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9': Fix potential synchronization issue in bitmap pool
| * | | | Merge "Fix potential synchronization issue in bitmap pool" into ↵Bobby Georgescu2013-05-221-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce
| | * | | | Fix potential synchronization issue in bitmap poolBobby Georgescu2013-05-211-2/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 9072712 Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
* | | | | am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba': Fix editor on ICS
| * | | | Fix editor on ICSMichael Kolb2013-05-221-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 9079902 Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
* | | | am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-222-2/+25
|\| | | | | | | | | | | | | | | | | | | * commit '37be6658075cac2bad0e30d93705dddeaaf1e421': Fix selection highlight for tablets
| * | | Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-212-2/+25
| |\ \ \
| | * | | Fix selection highlight for tabletsMichael Kolb2013-05-212-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9044356 Fixes selection highlight for the new asset sizes. Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
* | | | | am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-221-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
| * | | | Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
| |\ \ \ \
| | * | | | Fix heightJohn Reck2013-05-211-1/+2
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
* | | | | am 80a3d636: Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-223-1/+37
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d': Make capture thumbnail tappable in video mode.
| * | | Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
* | | Keep camera preview in view hierarchy.Angus Kong2013-05-211-5/+29
| | | | | | | | | | | | | | | | | | | | | Camera preview is a special case that needs to be kept to avoid unnecessary start and stop preview. Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
* | | Merge "Fix off-position issue after changing orientation" into ↵Angus Kong2013-05-221-93/+100
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Fix off-position issue after changing orientationAngus Kong2013-05-211-93/+100
| | | | | | | | | | | | | | | | Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
* | | | Merge "Combine code for bitmap decoding and add byte array decoding." into ↵George Mount2013-05-211-40/+78
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | Combine code for bitmap decoding and add byte array decoding.George Mount2013-05-211-40/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: Id780f94a5d939e5423b87f2e1d4ddf18b3dfa126
* | | | | Merge "Add comments to bitmap pools" into gb-ub-photos-carlsbadBobby Georgescu2013-05-212-6/+105
|\ \ \ \ \ | |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 01:20:50 +0000