summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add comments to bitmap poolsBobby Georgescu2013-05-212-6/+105
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie841316629ef0737dcdd5002b3278cf0bca3a768
* | | | | am aa77f39a: Merge "Fix camera controls blink on startup" into ↵Doris Liu2013-05-211-0/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | gb-ub-photos-bryce * commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
| * | | Merge "Fix camera controls blink on startup" into gb-ub-photos-bryceDoris Liu2013-05-211-0/+5
| |\ \ \
| | * | | Fix camera controls blink on startupDoris Liu2013-05-201-0/+5
| | | |/ | | |/| | | | | | | | | | | | | Bug: 9052837 Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
* | | | am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into ↵John Hoford2013-05-211-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'a285bc130ff1175c60085410f317e90f6443c39b': fix TinyPlanets Filter landscape crash
| * | | fix TinyPlanets Filter landscape crashJohn Hoford2013-05-201-1/+5
| |/ / | | | | | | | | | | | | bug:9038163 Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
* | | Merge "Fix jitter in FilmStripView." into gb-ub-photos-carlsbadAngus Kong2013-05-211-14/+51
|\ \ \
| * | | Fix jitter in FilmStripView.Angus Kong2013-05-201-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
* | | | am 286afab1: Merge "Avoid using region decoder for bad image types when ↵Ruben Brunk2013-05-201-26/+50
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | setting wallpaper." into gb-ub-photos-bryce * commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77': Avoid using region decoder for bad image types when setting wallpaper.
| * | | Merge "Avoid using region decoder for bad image types when setting ↵Ruben Brunk2013-05-201-26/+50
| |\ \ \ | | | | | | | | | | | | | | | wallpaper." into gb-ub-photos-bryce
| | * | | Avoid using region decoder for bad image types when setting wallpaper.Ruben Brunk2013-05-201-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8893617 Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
* | | | | am 7af7156a: Merge "Make sure canceling a filter does not undo previous ↵Sascha Haeberling2013-05-201-18/+2
|\| | | | | |_|/ / |/| | | | | | | | | | | | | | | | | | | filter." into gb-ub-photos-bryce * commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce': Make sure canceling a filter does not undo previous filter.
| * | | Merge "Make sure canceling a filter does not undo previous filter." into ↵Sascha Haeberling2013-05-201-18/+2
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-bryce
| | * | Make sure canceling a filter does not undo previous filter.Sascha Haeberling2013-05-081-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8770921 Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
* | | | am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
|\| | | | | | | | | | | | | | | | | | | * commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8': Disable zoom
| * | | Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
| |\ \ \
| | * | | Disable zoomJohn Hoford2013-05-171-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
* | | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 21:05:50 +0000