OSDN Git Service
Baligh Uddin [Wed, 3 Apr 2013 22:02:42 +0000 (15:02 -0700)]
am
1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1573bd489792795983639ccbdb8a88dae3c34d68':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 21:57:29 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Doris Liu [Wed, 3 Apr 2013 21:11:29 +0000 (14:11 -0700)]
am
d922866f: am
048a61c7: Improve black bar to keep camera controls in place
* commit '
d922866fa47d55a64bc63ec0b292897046065c33':
Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:09:08 +0000 (14:09 -0700)]
am
048a61c7: Improve black bar to keep camera controls in place
* commit '
048a61c7ab3f63688faeb39c253251e58f30c5f8':
Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 00:48:56 +0000 (17:48 -0700)]
Improve black bar to keep camera controls in place
Bug:
8340996
Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
John Hoford [Wed, 3 Apr 2013 19:39:53 +0000 (12:39 -0700)]
am
48f8d515: am
8ce4df01: fix touch action in draw
* commit '
48f8d51527ecfeab71c0d23c9642b3c1d9059a5f':
fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:34:29 +0000 (12:34 -0700)]
am
8ce4df01: fix touch action in draw
* commit '
8ce4df0105e645aed8503c3f03c98c208621911d':
fix touch action in draw
Baligh Uddin [Wed, 3 Apr 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e0293945a088c14757a9bc734b05ac741b5de4d
Auto-generated-cl: translation import
John Hoford [Wed, 3 Apr 2013 17:58:40 +0000 (10:58 -0700)]
fix touch action in draw
Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
nicolasroard [Wed, 3 Apr 2013 06:18:51 +0000 (23:18 -0700)]
am
0d74b562: am
2538c992: Fix segfaults in RS filters
* commit '
0d74b562db388f87f146931c410ccf3da1c72681':
Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 06:16:52 +0000 (23:16 -0700)]
am
2538c992: Fix segfaults in RS filters
* commit '
2538c992dc70b3eda7487ef68dba0390b2f337d7':
Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 05:22:37 +0000 (22:22 -0700)]
Fix segfaults in RS filters
We did not recreate the filters in all
cases when the input size change.
bug:
8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
Ruben Brunk [Tue, 2 Apr 2013 23:53:15 +0000 (16:53 -0700)]
am
62e921d2: am
ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
* commit '
62e921d237895fead41ad969cc03befcc760d6d5':
Speed improvements for ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:53:14 +0000 (16:53 -0700)]
am
6d35b711: am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
* commit '
6d35b711ff02de4a9d22cc4a913cd34ed0b1c15b':
fix calling Allocation.copyFrom without context
Ruben Brunk [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am
ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
* commit '
ca926f9c13fdd3f813811b02782d4fb4fb79d7f5':
Speed improvements for ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
* commit '
2b24604837aa9821d7e5ed409c2164ede803e0c4':
fix calling Allocation.copyFrom without context
Ruben Brunk [Tue, 2 Apr 2013 23:47:03 +0000 (23:47 +0000)]
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:45:23 +0000 (16:45 -0700)]
am
e0193fa9: am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
* commit '
e0193fa9603e9fefe7b0f4640f7ac337e56fe7f4':
Make stopPreview synchronous.
Ruben Brunk [Tue, 2 Apr 2013 23:45:23 +0000 (16:45 -0700)]
am
f8f2b484: am
7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
* commit '
f8f2b48464627496fdb0e71d6f29b25942f5d3c4':
Cleanup sloppy memory handling in ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:44:40 +0000 (23:44 +0000)]
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:39:57 +0000 (16:39 -0700)]
am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
* commit '
0e018f44d4ecccd9be27bd4eac04957741ae57d2':
Make stopPreview synchronous.
Ruben Brunk [Tue, 2 Apr 2013 23:39:56 +0000 (16:39 -0700)]
am
7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
* commit '
7bf0f568f7e09275477f1ff2a4ac107274798329':
Cleanup sloppy memory handling in ExifOutputStream.
Angus Kong [Tue, 2 Apr 2013 23:05:03 +0000 (23:05 +0000)]
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
John Hoford [Tue, 2 Apr 2013 22:55:55 +0000 (15:55 -0700)]
fix calling Allocation.copyFrom without context
bug:
8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
Ruben Brunk [Tue, 2 Apr 2013 20:15:57 +0000 (13:15 -0700)]
Speed improvements for ExifOutputStream.
Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
Ruben Brunk [Tue, 2 Apr 2013 22:19:05 +0000 (22:19 +0000)]
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 21:56:43 +0000 (14:56 -0700)]
Make stopPreview synchronous.
bug:
8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
Ruben Brunk [Tue, 2 Apr 2013 21:16:22 +0000 (14:16 -0700)]
Cleanup sloppy memory handling in ExifOutputStream.
Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
Bobby Georgescu [Tue, 2 Apr 2013 20:15:11 +0000 (13:15 -0700)]
am
d006c659: am
54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
* commit '
d006c65988e61f4f8ebe0764139b673c2bd0f68d':
Usage statistics for photo and video capture
Bobby Georgescu [Tue, 2 Apr 2013 20:11:41 +0000 (13:11 -0700)]
am
54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
* commit '
54762e1e909d7bf85dc913414b047be9a499c18a':
Usage statistics for photo and video capture
Bobby Georgescu [Tue, 2 Apr 2013 20:09:50 +0000 (20:09 +0000)]
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 22:33:17 +0000 (15:33 -0700)]
Usage statistics for photo and video capture
Bug:
8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
The Android Open Source Project [Tue, 2 Apr 2013 15:39:42 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia460e8a06b1d068077f52c35c045ad7325e78470
nicolasroard [Tue, 2 Apr 2013 15:24:44 +0000 (08:24 -0700)]
am
b1c06b88: am
20eb41f8: Fix stickiness issues with UI
* commit '
b1c06b881abcfff66951173819d73faaf0e40005':
Fix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 15:24:43 +0000 (08:24 -0700)]
am
64597c85: am
5bd6e14f: Don\'t try freeing resources on a different thread..
* commit '
64597c85ddfcc3800c81e1738c9a7b75649a0ae9':
Don't try freeing resources on a different thread..
Ruben Brunk [Tue, 2 Apr 2013 15:24:35 +0000 (08:24 -0700)]
am
890ebeb0: am
e7aa98e5: Changed editor back button behavior.
* commit '
890ebeb0a7af5f804f6ae567f0e10d2b7323626f':
Changed editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 15:24:17 +0000 (08:24 -0700)]
am
dd9a6fb6: am
902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
* commit '
dd9a6fb653d3dbb0238d7436087dc7bce8a9f00d':
Change panels organization. Also fixes border updates handling.
Michael Kolb [Tue, 2 Apr 2013 15:24:16 +0000 (08:24 -0700)]
am
63d9e873: am
fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce
* commit '
63d9e87389ac1ecc5b68c6e49794a5462c415a21':
Pie design update
Angus Kong [Tue, 2 Apr 2013 15:24:07 +0000 (08:24 -0700)]
am
b4edf5b3: am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
b4edf5b3d83a369f1197617891dc959109e703b8':
Handle InterruptedException in waitDone
Ruben Brunk [Tue, 2 Apr 2013 15:24:04 +0000 (08:24 -0700)]
am
65ef29f9: am
0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
* commit '
65ef29f96b44267076ca38c4bffc752d92d1f087':
Added apply UI callbacks for rotate/mirror operations.
Angus Kong [Tue, 2 Apr 2013 15:23:51 +0000 (08:23 -0700)]
am
07abb731: am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
07abb731115e3e6c3aec954d7bcec495aed2a262':
Don't use SynchronousQueue to pass results.
Bobby Georgescu [Tue, 2 Apr 2013 15:23:45 +0000 (08:23 -0700)]
am
adde6e72: am
8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
* commit '
adde6e725f2e721cb9fc18c4ca2d3f8d62d0bda4':
Usage statistics for camera settings
Bobby Georgescu [Tue, 2 Apr 2013 15:23:45 +0000 (08:23 -0700)]
am
36f54901: am
6058af44: Enforce bmp type in pool, handle MTP image decode failure
* commit '
36f54901e1a475c74c633cd9ad6b9ba8ae28448f':
Enforce bmp type in pool, handle MTP image decode failure
nicolasroard [Tue, 2 Apr 2013 05:42:01 +0000 (22:42 -0700)]
am
20eb41f8: Fix stickiness issues with UI
* commit '
20eb41f87e35033a783adf76286c10bb1534a56d':
Fix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Fix stickiness issues with UI
The renderGeometryIcon() function shouldn't
be synchronized -- it's independent of the rest
of the pipeline and is only used to apply a given geometry.
Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
nicolasroard [Tue, 2 Apr 2013 04:42:45 +0000 (21:42 -0700)]
am
5bd6e14f: Don\'t try freeing resources on a different thread..
* commit '
5bd6e14f2c2b06943fa542921241b79566b3c6e2':
Don't try freeing resources on a different thread..
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Don't try freeing resources on a different thread..
This call to freeResources happens on the main thread.
It's also not really useful. The geometry instance
shouldn't be shared either.
bug:
8522497
Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
Ruben Brunk [Tue, 2 Apr 2013 01:22:22 +0000 (18:22 -0700)]
am
e7aa98e5: Changed editor back button behavior.
* commit '
e7aa98e533531f5e82f5de37c24701bc44bc6cd1':
Changed editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 00:26:42 +0000 (17:26 -0700)]
Changed editor back button behavior.
Bug:
8522150
Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
Ruben Brunk [Tue, 2 Apr 2013 00:00:57 +0000 (17:00 -0700)]
am
902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
* commit '
902a6f7f6bea14b22fe16f61c55e7ca6306cc210':
Change panels organization. Also fixes border updates handling.
Ruben Brunk [Tue, 2 Apr 2013 00:00:01 +0000 (00:00 +0000)]
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 23:55:05 +0000 (16:55 -0700)]
Change panels organization. Also fixes border updates handling.
Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
Michael Kolb [Mon, 1 Apr 2013 23:47:48 +0000 (16:47 -0700)]
am
fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce
* commit '
fa3b121ebfa10149e4c721838a89a76235a8a0c8':
Pie design update
Michael Kolb [Mon, 1 Apr 2013 23:46:06 +0000 (23:46 +0000)]
Merge "Pie design update" into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:24:42 +0000 (10:24 -0700)]
Pie design update
Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
Angus Kong [Mon, 1 Apr 2013 23:14:26 +0000 (16:14 -0700)]
am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
ce9ca226e0c24865314e962b3b276b5ed2f2899d':
Handle InterruptedException in waitDone
Angus Kong [Mon, 1 Apr 2013 22:19:02 +0000 (15:19 -0700)]
am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
36cac0c2a107a05225185430969975f7dfd81c89':
Don't use SynchronousQueue to pass results.
Angus Kong [Mon, 1 Apr 2013 18:07:38 +0000 (11:07 -0700)]
am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
* commit '
bb746823c1b966562ed4f0f170289cd133f6ff6c':
Fix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 23:14:26 +0000 (16:14 -0700)]
am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
ce9ca226e0c24865314e962b3b276b5ed2f2899d':
Handle InterruptedException in waitDone
Angus Kong [Mon, 1 Apr 2013 23:13:16 +0000 (23:13 +0000)]
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 23:09:18 +0000 (16:09 -0700)]
am
0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
* commit '
0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6':
Added apply UI callbacks for rotate/mirror operations.
Ruben Brunk [Mon, 1 Apr 2013 23:07:42 +0000 (23:07 +0000)]
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 22:59:09 +0000 (15:59 -0700)]
Handle InterruptedException in waitDone
Dirty bit for mParameters should be set properly if getParameters is not
finished.
bug:
8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
Angus Kong [Mon, 1 Apr 2013 22:19:02 +0000 (15:19 -0700)]
am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
36cac0c2a107a05225185430969975f7dfd81c89':
Don't use SynchronousQueue to pass results.
Angus Kong [Mon, 1 Apr 2013 22:17:30 +0000 (22:17 +0000)]
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 21:30:30 +0000 (14:30 -0700)]
Don't use SynchronousQueue to pass results.
bug:
8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
Bobby Georgescu [Mon, 1 Apr 2013 21:48:47 +0000 (14:48 -0700)]
am
8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
* commit '
8f8811fa16147532716e5a4a70fda2f555d20589':
Usage statistics for camera settings
Bobby Georgescu [Mon, 1 Apr 2013 21:45:42 +0000 (14:45 -0700)]
am
6058af44: Enforce bmp type in pool, handle MTP image decode failure
* commit '
6058af443b087ba50741cc3e61ec70e830e498fa':
Enforce bmp type in pool, handle MTP image decode failure
Bobby Georgescu [Mon, 1 Apr 2013 21:45:34 +0000 (21:45 +0000)]
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 21:41:45 +0000 (14:41 -0700)]
Added apply UI callbacks for rotate/mirror operations.
Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
Bobby Georgescu [Mon, 1 Apr 2013 20:48:29 +0000 (13:48 -0700)]
Enforce bmp type in pool, handle MTP image decode failure
- GalleryBitmapPool didn't reject bitmap types other than
ARGB_8888 which could lead to problems when a different type
is used for recycling.
- BitmapFactory throws an exception rather than returning null
when image decoding fails and an existing bitmap was supplied
for recycling, even if the failure was not caused by the use
of that bitmap. When decoding things from an MTP device, we
need to handle this since unsupported formats may be returned.
Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
Bobby Georgescu [Mon, 1 Apr 2013 21:31:40 +0000 (14:31 -0700)]
Usage statistics for camera settings
Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
Angus Kong [Mon, 1 Apr 2013 18:10:57 +0000 (11:10 -0700)]
am
960cad7f: am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
* commit '
960cad7f4c7ccdd1d0979c06fe5c97fb610aefa6':
Fix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 18:07:38 +0000 (11:07 -0700)]
am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
* commit '
bb746823c1b966562ed4f0f170289cd133f6ff6c':
Fix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 18:06:06 +0000 (18:06 +0000)]
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 17:48:22 +0000 (10:48 -0700)]
am
62b8cc9e: am
8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
* commit '
62b8cc9e846f33503e4fa3c03f543b26f6a932e6':
Preliminary Album grid header in new gallery
Bobby Georgescu [Mon, 1 Apr 2013 17:44:28 +0000 (10:44 -0700)]
am
8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
* commit '
8227ac6685be19bda8e3601c3980847ae8cf3041':
Preliminary Album grid header in new gallery
Bobby Georgescu [Mon, 1 Apr 2013 17:42:46 +0000 (17:42 +0000)]
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 29 Mar 2013 22:58:42 +0000 (15:58 -0700)]
Preliminary Album grid header in new gallery
Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
Angus Kong [Mon, 1 Apr 2013 16:55:24 +0000 (09:55 -0700)]
Fix NPE when reconnecting camera.
bug:
8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
George Mount [Mon, 1 Apr 2013 14:15:17 +0000 (07:15 -0700)]
am
1dba3693: am
c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
* commit '
1dba3693c3ca87b288b8329e5b243c1067d29c04':
Remove ImageCache from PhotoProvider in favor of MediaCache.
George Mount [Mon, 1 Apr 2013 14:12:35 +0000 (07:12 -0700)]
am
c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
* commit '
c6a1167ec0e461ad202b58614f1a53ec38443654':
Remove ImageCache from PhotoProvider in favor of MediaCache.
George Mount [Mon, 1 Apr 2013 14:10:38 +0000 (14:10 +0000)]
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
The Android Automerger [Mon, 1 Apr 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Sat, 30 Mar 2013 22:04:44 +0000 (15:04 -0700)]
am
9af3e6b8: am
5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
* commit '
9af3e6b8d517ca7a1585dc5f373072b8148adb74':
Fix double-tap behaviour
nicolasroard [Sat, 30 Mar 2013 22:04:43 +0000 (15:04 -0700)]
am
de0f9f15: am
1ad3cd57: Fixes some state synchronization issues
* commit '
de0f9f15badb8cc26cfbdf5e93321a838a6fa6d8':
Fixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 22:03:08 +0000 (15:03 -0700)]
am
5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
* commit '
5997a0138287fe08f414ffb097c8e088a47bf101':
Fix double-tap behaviour
nicolasroard [Sat, 30 Mar 2013 22:03:07 +0000 (15:03 -0700)]
am
1ad3cd57: Fixes some state synchronization issues
* commit '
1ad3cd574da4e998e55e4ff4861ff19e2ea982bd':
Fixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 22:01:33 +0000 (22:01 +0000)]
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 19:56:20 +0000 (12:56 -0700)]
Fix double-tap behaviour
Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
nicolasroard [Sat, 30 Mar 2013 19:08:58 +0000 (12:08 -0700)]
Fixes some state synchronization issues
Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
nicolasroard [Sat, 30 Mar 2013 02:29:06 +0000 (19:29 -0700)]
am
dd43c25b: am
ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce
* commit '
dd43c25b0b2e58a02369d791404f101d9cab1990':
Implements progressive rendering
nicolasroard [Sat, 30 Mar 2013 02:28:03 +0000 (19:28 -0700)]
am
ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce
* commit '
ad42027590c52fcc522c06d311f28742e0441ec0':
Implements progressive rendering
nicolasroard [Sat, 30 Mar 2013 02:26:18 +0000 (02:26 +0000)]
Merge "Implements progressive rendering" into gb-ub-photos-bryce
nicolasroard [Fri, 29 Mar 2013 21:41:38 +0000 (14:41 -0700)]
Implements progressive rendering
Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
Ruben Brunk [Sat, 30 Mar 2013 01:08:06 +0000 (18:08 -0700)]
am
f989f148: am
e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
* commit '
f989f14860ce9e0b551f140141816464a7024616':
Added "discard unsaved changes" behavior for exiting.
Ruben Brunk [Sat, 30 Mar 2013 01:04:40 +0000 (18:04 -0700)]
am
e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
* commit '
e0e9fff3ff81faec02b243eabb1502a97a4e4adb':
Added "discard unsaved changes" behavior for exiting.
Ruben Brunk [Sat, 30 Mar 2013 01:03:24 +0000 (01:03 +0000)]
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
George Mount [Wed, 27 Mar 2013 23:53:41 +0000 (16:53 -0700)]
Remove ImageCache from PhotoProvider in favor of MediaCache.
Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
George Mount [Fri, 29 Mar 2013 23:17:39 +0000 (16:17 -0700)]
am
b164f7f6: am
fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
* commit '
b164f7f694d1f93090e26fc242b45a3c8d4fb7ce':
Add initial implementation of MediaCache.
OSDN Git Service
