OSDN Git Service
Michael Kolb [Tue, 29 Jan 2013 23:24:34 +0000 (23:24 +0000)]
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
John Reck [Tue, 29 Jan 2013 21:55:57 +0000 (13:55 -0800)]
Extract constants/boilerplate
Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
nicolasroard [Tue, 29 Jan 2013 21:41:51 +0000 (21:41 +0000)]
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 21:38:34 +0000 (21:38 +0000)]
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:37:33 +0000 (13:37 -0800)]
Fix thumbnail generation
Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
Bobby Georgescu [Tue, 29 Jan 2013 21:30:12 +0000 (13:30 -0800)]
Importer: when view is reused for same image, don't reload
Bug:
7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
nicolasroard [Tue, 29 Jan 2013 21:23:46 +0000 (21:23 +0000)]
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:16:21 +0000 (13:16 -0800)]
Fix scaling + quality parameters
Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
Michael Kolb [Tue, 29 Jan 2013 20:51:56 +0000 (20:51 +0000)]
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 18:58:34 +0000 (10:58 -0800)]
Add comment about MenuExecutor assumptions in BatchService
Bug:
7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
Michael Kolb [Tue, 29 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
John Reck [Tue, 29 Jan 2013 01:35:38 +0000 (01:35 +0000)]
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
Ruben Brunk [Tue, 29 Jan 2013 00:54:58 +0000 (00:54 +0000)]
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 00:51:51 +0000 (00:51 +0000)]
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 00:46:12 +0000 (16:46 -0800)]
Fix apply geometry.
bug:
8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
John Reck [Tue, 29 Jan 2013 00:38:47 +0000 (16:38 -0800)]
Launching gallery shows browse ui on canvas
Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
Ruben Brunk [Tue, 29 Jan 2013 00:30:26 +0000 (16:30 -0800)]
Fixed BasicEditor NPE.
Bug:
8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
Bobby Georgescu [Tue, 29 Jan 2013 00:16:44 +0000 (16:16 -0800)]
Fix ANRs due to waiting for IO on UI thread
Bug:
7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
John Reck [Mon, 28 Jan 2013 21:35:56 +0000 (13:35 -0800)]
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
Baligh Uddin [Mon, 28 Jan 2013 16:59:39 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9d2f2471d62cbfdd11c9d3e6d9107fbc46fad3dd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Jan 2013 22:36:04 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 23 Jan 2013 19:53:27 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id76648ccbbb45ea8d7ab7a759cd07bce5feb35ca
Auto-generated-cl: translation import
Stephen Hines [Wed, 23 Jan 2013 18:38:42 +0000 (18:38 +0000)]
Revert "Switch Gallery over to RS compatibility library."
This reverts commit
0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
Stephen Hines [Thu, 17 Jan 2013 01:54:08 +0000 (17:54 -0800)]
Switch Gallery over to RS compatibility library.
Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
Baligh Uddin [Wed, 23 Jan 2013 01:03:13 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Wed, 16 Jan 2013 03:57:49 +0000 (19:57 -0800)]
Better caching for RS filters
Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
Baligh Uddin [Tue, 22 Jan 2013 17:42:53 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8a59ba2c18264af55063a5c3bf5ba6b7edec00cc
Auto-generated-cl: translation import
John Reck [Sat, 19 Jan 2013 00:45:14 +0000 (00:45 +0000)]
Merge "Tweaks for canvas" into gb-ub-photos-bryce
John Reck [Sat, 19 Jan 2013 00:00:45 +0000 (16:00 -0800)]
Tweaks for canvas
Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
John Hoford [Fri, 18 Jan 2013 23:56:51 +0000 (23:56 +0000)]
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
John Hoford [Fri, 18 Jan 2013 16:59:35 +0000 (08:59 -0800)]
refactor the filter/editor relationship
Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
Bobby Georgescu [Fri, 18 Jan 2013 20:47:56 +0000 (12:47 -0800)]
Fix importer crashes on unplug during scrolling
Bug:
8035040
Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
Bobby Georgescu [Thu, 17 Jan 2013 22:07:31 +0000 (14:07 -0800)]
Fix importer crashes when unplugging during indexing
Bug:
8027984
Slightly refactored the indexing step to encapsulate all
of the indexing work within the runnable that does it and
to correctly handle the cases where the device is unplugged
in the middle of the indexing.
Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
Bobby Georgescu [Fri, 18 Jan 2013 01:12:40 +0000 (01:12 +0000)]
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 17 Jan 2013 20:30:06 +0000 (12:30 -0800)]
Show status in importer for empty or no device
Bug:
8000251
Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
Baligh Uddin [Thu, 17 Jan 2013 21:39:49 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 17 Jan 2013 21:38:33 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
John Reck [Thu, 17 Jan 2013 02:09:08 +0000 (02:09 +0000)]
Merge "New loading model" into gb-ub-photos-bryce
John Reck [Wed, 16 Jan 2013 22:10:30 +0000 (14:10 -0800)]
New loading model
Rename reload() to loadIfDirty()
loadIfDirty is implemented by MediaSet and is final
loadIfDirty is now blocking instead of async
Subclasses must implement two protected methods, isDirtyLocked() and load()
The change from async reload() to sync loadIfDirty() should be fine since
all users of reload() were doing so from a background thread already, and the
longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so
Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
Angus Kong [Wed, 16 Jan 2013 23:52:32 +0000 (15:52 -0800)]
Add image/webp type to intent filter
bug:
8012543
Change-Id: I0ebd2941c5508d169855864165e93e2ea1dacf81
Bobby Georgescu [Wed, 16 Jan 2013 22:39:01 +0000 (22:39 +0000)]
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 16 Jan 2013 22:15:49 +0000 (14:15 -0800)]
Always have determinate progress in import notification
Bug:
7967520
Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
John Reck [Wed, 16 Jan 2013 22:09:45 +0000 (22:09 +0000)]
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 16 Jan 2013 21:22:37 +0000 (13:22 -0800)]
Importer date tiles reflect language change
Bug:
8020035
Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
Baligh Uddin [Wed, 16 Jan 2013 19:48:32 +0000 (11:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic353210ead354b4da42c0f7500e7fed2a4cf174c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Jan 2013 19:47:12 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf6bf3b0c6563577b4e33f41252f18923caed6c3
Auto-generated-cl: translation import
John Reck [Wed, 16 Jan 2013 01:50:39 +0000 (17:50 -0800)]
Add a blocking load to MediaSet
Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
Ruben Brunk [Wed, 16 Jan 2013 01:23:40 +0000 (17:23 -0800)]
Fix exif data saving for picasa images.
Bug:
7910836
Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
John Hoford [Mon, 14 Jan 2013 22:48:39 +0000 (14:48 -0800)]
refactoring imageshow
Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
Baligh Uddin [Tue, 15 Jan 2013 15:24:01 +0000 (07:24 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 14 Jan 2013 23:43:32 +0000 (15:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia46ffed829d3290ad59bd4f33f20efd4810860f4
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Jan 2013 23:42:35 +0000 (15:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I17eea6532abf3df04771e725dd16a94212b8b62f
Auto-generated-cl: translation import
Ruben Brunk [Mon, 14 Jan 2013 18:22:05 +0000 (10:22 -0800)]
Fixed ClassCastException on open crop aspect menu.
Bug:
7999315
Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
George Mount [Sun, 13 Jan 2013 22:39:29 +0000 (14:39 -0800)]
Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
George Mount [Sun, 13 Jan 2013 19:05:05 +0000 (11:05 -0800)]
Fix LightCycle capture NullPointerException.
Bug
7987002
During capture animation, allow LightCycle to write the
current frame to a texture, then use that texture for drawing
the background image.
Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
Ruben Brunk [Wed, 19 Dec 2012 18:47:49 +0000 (10:47 -0800)]
Refactoring button class. Minor bug fixes.
Bug:
7875246
Bug:
7459118
Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
George Mount [Wed, 9 Jan 2013 23:56:33 +0000 (15:56 -0800)]
Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
Baligh Uddin [Wed, 9 Jan 2013 22:11:01 +0000 (14:11 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 9 Jan 2013 22:10:43 +0000 (14:10 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
George Mount [Tue, 8 Jan 2013 00:17:14 +0000 (16:17 -0800)]
Fix slide show animation so that cross fades work.
Bug
7961297
Removed the "Additive" blending, which didn't do anything, even in
OpenGL ES 1.1 implementation. Modified the texturing to
change the color of the pixels based on the supplied alpha
rather than modifying the alpha. This appears to match the
implementation in the OpenGL ES 1.1 pipeline.
Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
Baligh Uddin [Wed, 9 Jan 2013 20:07:21 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: If0150dc371afd98cb5512a5f29c51d5554b99008
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Jan 2013 20:06:35 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a2f3a5e9c081b2e19de1188b805da3f7c1ba216
Auto-generated-cl: translation import
nicolasroard [Wed, 9 Jan 2013 19:42:29 +0000 (11:42 -0800)]
Refactor filters management
Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
John Hoford [Fri, 28 Dec 2012 23:45:57 +0000 (15:45 -0800)]
Add the Drama filter
Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
John Hoford [Tue, 8 Jan 2013 22:20:58 +0000 (14:20 -0800)]
Merge "Add a Draw filter" into gb-ub-photos-bryce
John Hoford [Tue, 8 Jan 2013 22:15:19 +0000 (14:15 -0800)]
Add a Draw filter
Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
nicolasroard [Tue, 8 Jan 2013 21:10:51 +0000 (13:10 -0800)]
Merge "Refactoring UI editors" into gb-ub-photos-bryce
nicolasroard [Tue, 8 Jan 2013 03:43:14 +0000 (19:43 -0800)]
Refactoring UI editors
bug:
7688780
Change-Id: I30f8691788332a01d591435474a84cc352b71138
George Mount [Tue, 8 Jan 2013 18:22:16 +0000 (10:22 -0800)]
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
George Mount [Mon, 7 Jan 2013 22:15:10 +0000 (14:15 -0800)]
Instantiate GLCanvas rather than reinitialize current GLCanvas.
GLCanvas was being used as a singleton when it really should
allow separate instances for correctness.
Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
Bobby Georgescu [Wed, 26 Dec 2012 08:52:28 +0000 (00:52 -0800)]
Replace camera importer
Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
Bobby Georgescu [Mon, 7 Jan 2013 20:59:00 +0000 (12:59 -0800)]
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 7 Jan 2013 19:25:46 +0000 (11:25 -0800)]
Fix camera->gallery relaunch loop on empty camera album
Bug:
7952132
Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
Baligh Uddin [Wed, 2 Jan 2013 21:16:54 +0000 (13:16 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 2 Jan 2013 18:15:36 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia064f134f9ec6404207ccb9d2852681c4f5f1bbe
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Jan 2013 18:14:45 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I21443ea53d6766eb093262f61c01c145d20e9b6a
Auto-generated-cl: translation import
nicolasroard [Fri, 28 Dec 2012 00:16:31 +0000 (16:16 -0800)]
Fix crash when using red eyes correction
bug:
7680079
Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
Ruben Brunk [Tue, 18 Dec 2012 23:47:40 +0000 (15:47 -0800)]
Made downsampling filter preview accurate.
Bug:
7892268
Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
Ruben Brunk [Wed, 19 Dec 2012 18:46:40 +0000 (10:46 -0800)]
Merge "Change XML character limit for string." into gb-ub-photos-bryce
Earl Ou [Fri, 7 Dec 2012 07:49:05 +0000 (15:49 +0800)]
add javadoc for ExifOutputStream
Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
Earl Ou [Fri, 7 Dec 2012 08:56:10 +0000 (16:56 +0800)]
add help function to decode user comment in ExifData
Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
Earl Ou [Fri, 7 Dec 2012 08:01:09 +0000 (16:01 +0800)]
add javadoc for Rational and IfdId in Exif package
Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
Earl Ou [Fri, 7 Dec 2012 07:58:19 +0000 (15:58 +0800)]
Replace original tags when add tags in ExifTag
Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
Earl Ou [Thu, 6 Dec 2012 10:12:08 +0000 (18:12 +0800)]
Use ExifOutputStream in SaveCopyTask
Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
Angus Kong [Wed, 19 Dec 2012 12:16:29 +0000 (04:16 -0800)]
Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
Angus Kong [Wed, 19 Dec 2012 06:52:34 +0000 (22:52 -0800)]
Merge "ExifModifier" into gb-ub-photos-bryce
Earl Ou [Thu, 6 Dec 2012 08:51:32 +0000 (16:51 +0800)]
Apply ExifModifier for rotation
Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:
7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
The auto-merge of this CL from Arches to Bryce had a merge conflict,
so I canceled the auto-merge and then did this manual cherry-pick.
Bart Sears [Tue, 18 Dec 2012 20:58:15 +0000 (12:58 -0800)]
resolved conflicts for merge of
5b188c94 to gb-ub-photos-bryce
Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
Ruben Brunk [Tue, 18 Dec 2012 03:46:41 +0000 (19:46 -0800)]
Change XML character limit for string.
Bug:
7875246
Change-Id: I883fd175db85efcacfae32c6c690480c8f3c7484
Ruben Brunk [Tue, 18 Dec 2012 01:54:16 +0000 (17:54 -0800)]
Disabled further filters after Tiny Planet.
Bug:
7407176
Temporary fix. We need to handle filters changing the image
geometry properly.
Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
George Mount [Mon, 17 Dec 2012 22:16:58 +0000 (14:16 -0800)]
Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
George Mount [Tue, 11 Dec 2012 15:43:51 +0000 (07:43 -0800)]
Move LightCycle to render directly to GLRootView.
Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
Ruben Brunk [Mon, 17 Dec 2012 19:56:30 +0000 (11:56 -0800)]
Improved performance for Kmeans filter.
Bug:
7739334
Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
Doris Liu [Thu, 13 Dec 2012 01:47:12 +0000 (17:47 -0800)]
Add relativePath field into photo widget db
Bug:
7481248
The bug is caused by the change of external storage going from JB to JBMR1.
In light of this change, a new field has been added to the photo widget app
database to store the relative path for the local album. With the relative paths
stored, the widget app should be more resilient to future storage path changes.
Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
Baligh Uddin [Fri, 14 Dec 2012 18:30:30 +0000 (10:30 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 14 Dec 2012 18:26:12 +0000 (10:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ief7fd6315479227b744f9dc8a4c93d5d1f8094bf
Auto-generated-cl: translation import
Baligh Uddin [Fri, 14 Dec 2012 18:25:24 +0000 (10:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie43a18a662cb75c76dcfb807ab9686388fd4e36c
Auto-generated-cl: translation import
Bobby Georgescu [Fri, 14 Dec 2012 08:50:54 +0000 (00:50 -0800)]
Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
OSDN Git Service
