OSDN Git Service
John Hoford [Tue, 23 Oct 2012 23:01:24 +0000 (16:01 -0700)]
am
4b2c4ecb: am
67fefdb9: add support for black and white filters, add rotation API to tiny planet
* commit '
4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8':
add support for black and white filters, add rotation API to tiny planet
Bobby Georgescu [Tue, 23 Oct 2012 22:59:20 +0000 (15:59 -0700)]
am
c67bc34b: am
a850a543: Fix jank when launching editor from Camera filmstrip
* commit '
c67bc34b5466298ce972b9c1b8949d47f0e2cea0':
Fix jank when launching editor from Camera filmstrip
John Hoford [Tue, 23 Oct 2012 22:58:55 +0000 (15:58 -0700)]
am
67fefdb9: add support for black and white filters, add rotation API to tiny planet
* commit '
67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
add support for black and white filters, add rotation API to tiny planet
Bobby Georgescu [Tue, 23 Oct 2012 22:56:32 +0000 (15:56 -0700)]
am
a850a543: Fix jank when launching editor from Camera filmstrip
* commit '
a850a543225e9f7a72c5a49bb6099573c7efda13':
Fix jank when launching editor from Camera filmstrip
John Hoford [Tue, 23 Oct 2012 22:17:12 +0000 (15:17 -0700)]
add support for black and white filters, add rotation API to tiny planet
bug:
7386370
bug:
7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
Bobby Georgescu [Tue, 23 Oct 2012 22:40:06 +0000 (15:40 -0700)]
Fix jank when launching editor from Camera filmstrip
Bug:
7301182
Status bar visibility in FilterShow will now match
the one in Camera/Gallery so that there isn't weird
jank when launching.
Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
nicolasroard [Tue, 23 Oct 2012 22:36:14 +0000 (15:36 -0700)]
am
f22aa1a2: am
41a3a3be: Fix slider layout
* commit '
f22aa1a292d6b69b1f1307cd59e578c3e99e1e60':
Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:33:09 +0000 (15:33 -0700)]
am
41a3a3be: Fix slider layout
* commit '
41a3a3be3f263a3b9c902fbec3124a7ea296d525':
Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:25:39 +0000 (15:25 -0700)]
Fix slider layout
bug:
7383094
Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c
nicolasroard [Tue, 23 Oct 2012 22:12:57 +0000 (15:12 -0700)]
am
a482d850: am
cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
* commit '
a482d85068e39eb28cb854bc142d882b95b3b10c':
Express the borders size in percentages
John Reck [Tue, 23 Oct 2012 22:12:56 +0000 (15:12 -0700)]
am
94fa0565: am
d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
* commit '
94fa0565844a6095d52d45cfe366425110666b42':
Fix NPE
nicolasroard [Tue, 23 Oct 2012 22:10:56 +0000 (15:10 -0700)]
am
cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
* commit '
cb993ff18944a7ba1981406c3c8adf3fe36755c0':
Express the borders size in percentages
John Reck [Tue, 23 Oct 2012 22:10:55 +0000 (15:10 -0700)]
am
d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
* commit '
d6453edcdbdad2706d8ce4a4fddd8f7df347b78c':
Fix NPE
nicolasroard [Tue, 23 Oct 2012 22:09:53 +0000 (15:09 -0700)]
Merge "Express the borders size in percentages" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:08:35 +0000 (15:08 -0700)]
Merge "Fix NPE" into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:08:29 +0000 (15:08 -0700)]
am
71647c7a: am
7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
* commit '
71647c7af135e397035398aee3d7be7a0ebad670':
Fix NPE in detecting panoramas.
George Mount [Tue, 23 Oct 2012 22:06:44 +0000 (15:06 -0700)]
am
7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
* commit '
7d7f91e1771e67af1fca5f2b3f221968df3de077':
Fix NPE in detecting panoramas.
George Mount [Tue, 23 Oct 2012 22:03:14 +0000 (15:03 -0700)]
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 20:44:58 +0000 (13:44 -0700)]
Fix NPE
Bug:
7399438
Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
nicolasroard [Tue, 23 Oct 2012 21:35:28 +0000 (14:35 -0700)]
am
bd4ea013: am
ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
* commit '
bd4ea013d97d896b7865993dc9917313a7040259':
Hide the history panel on rotation
nicolasroard [Tue, 23 Oct 2012 21:33:47 +0000 (14:33 -0700)]
am
ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
* commit '
ea6360298ca823634c9f2ee8990546f753288da9':
Hide the history panel on rotation
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Express the borders size in percentages
bug:
7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
nicolasroard [Tue, 23 Oct 2012 21:31:49 +0000 (14:31 -0700)]
Merge "Hide the history panel on rotation" into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 21:28:58 +0000 (14:28 -0700)]
Fix NPE in detecting panoramas.
Bug
7398022
Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Hide the history panel on rotation
bug:
7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
Sascha Haeberling [Tue, 23 Oct 2012 21:07:36 +0000 (14:07 -0700)]
am
25d08e2b: am
a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
* commit '
25d08e2bba04fbf88ca138653f7adabc306f1a43':
Make sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 21:05:21 +0000 (14:05 -0700)]
am
a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
* commit '
a681f36f3c0642135a3ad4dcd529cbff08798d53':
Make sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 21:03:32 +0000 (14:03 -0700)]
Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
Sascha Haeberling [Tue, 23 Oct 2012 20:38:52 +0000 (13:38 -0700)]
Make sure we use xmp_toolkit from external instead of the precompiled JAR.
Bug:
7400527
Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
nicolasroard [Tue, 23 Oct 2012 20:08:42 +0000 (13:08 -0700)]
am
bc9d4ccc: am
5d7e98f7: Fix another potential crash in Curves
* commit '
bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c':
Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:05:46 +0000 (13:05 -0700)]
am
5d7e98f7: Fix another potential crash in Curves
* commit '
5d7e98f781fbd450295850d00adfb50540d53b3f':
Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 19:59:16 +0000 (12:59 -0700)]
Fix another potential crash in Curves
bug:
7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
nicolasroard [Tue, 23 Oct 2012 19:49:37 +0000 (12:49 -0700)]
am
0b44017c: am
361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
* commit '
0b44017c53fabaa7a9434bf21708a94b48a5db52':
Fix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:47:27 +0000 (12:47 -0700)]
am
361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
* commit '
361f6234c02207b2d812db0b2aeed267013c9a1f':
Fix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:45:50 +0000 (12:45 -0700)]
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel
bug:
7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
Bobby Georgescu [Tue, 23 Oct 2012 18:54:40 +0000 (11:54 -0700)]
am
f30096b4: am
c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit '
f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b':
Show Panorama viewer button in filmstrip mode
Bobby Georgescu [Tue, 23 Oct 2012 18:52:53 +0000 (11:52 -0700)]
am
c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit '
c162c8b70b795e95ebe53154ddb86ecf188eade0':
Show Panorama viewer button in filmstrip mode
Bobby Georgescu [Tue, 23 Oct 2012 18:51:06 +0000 (11:51 -0700)]
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 18:44:02 +0000 (11:44 -0700)]
am
e5a3ff76: am
a9f280f9: Add copyright notices
* commit '
e5a3ff7692de92739645d97d72b5bdc599fd6fbf':
Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:42:32 +0000 (11:42 -0700)]
am
a9f280f9: Add copyright notices
* commit '
a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
Add copyright notices
Bobby Georgescu [Tue, 23 Oct 2012 18:20:48 +0000 (11:20 -0700)]
Show Panorama viewer button in filmstrip mode
Bug:
7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices
bug:
7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
nicolasroard [Tue, 23 Oct 2012 18:16:13 +0000 (11:16 -0700)]
am
cdaa77d2: am
ec995b6b: Fix slow / jerky tracking in Curves
* commit '
cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58':
Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:14:20 +0000 (11:14 -0700)]
am
ec995b6b: Fix slow / jerky tracking in Curves
* commit '
ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc':
Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 17:51:42 +0000 (10:51 -0700)]
Fix slow / jerky tracking in Curves
bug:
7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
nicolasroard [Tue, 23 Oct 2012 17:39:40 +0000 (10:39 -0700)]
am
488547b0: am
2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
* commit '
488547b08f909a2f35433764fc97a5f8c7c990df':
Shows filtered images in geometry modules and comparison.
nicolasroard [Tue, 23 Oct 2012 17:36:47 +0000 (10:36 -0700)]
am
2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
* commit '
2569df233987d1f43400a813ceb2ce72c738a4c3':
Shows filtered images in geometry modules and comparison.
nicolasroard [Tue, 23 Oct 2012 17:34:10 +0000 (10:34 -0700)]
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 17:30:59 +0000 (10:30 -0700)]
am
3bfbae1d: am
24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
* commit '
3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9':
Ensure photo sphere icon shows for panoramas.
George Mount [Tue, 23 Oct 2012 17:28:35 +0000 (10:28 -0700)]
am
24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
* commit '
24af89b96e824e4a5f9053c2024f507087117c22':
Ensure photo sphere icon shows for panoramas.
George Mount [Tue, 23 Oct 2012 17:26:49 +0000 (10:26 -0700)]
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
nicolasroard [Sat, 20 Oct 2012 19:32:05 +0000 (12:32 -0700)]
Shows filtered images in geometry modules and comparison.
bug:
7279469
bug:
7379286
bug:
7344214
bug:
7379140
Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves
Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
George Mount [Tue, 23 Oct 2012 16:33:20 +0000 (09:33 -0700)]
Ensure photo sphere icon shows for panoramas.
Bug
7393844
Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
Baligh Uddin [Tue, 23 Oct 2012 15:57:57 +0000 (08:57 -0700)]
am
306176fb: (-s ours) am
7c08064b: (-s ours) Import translations. DO NOT MERGE
* commit '
306176fbd21ece931ccff21bbe6cfa04a1cc751d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:56 +0000 (08:57 -0700)]
am
caace51d: (-s ours) Import translations. DO NOT MERGE
* commit '
caace51d7168d1cb2467268379c0883c4cb69853':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:00 +0000 (08:57 -0700)]
am
7c08064b: (-s ours) Import translations. DO NOT MERGE
* commit '
7c08064bc790dff6ab9da24d8aa07a96c9185b6a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:55:55 +0000 (07:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64f71b4a576e4dca36d423471e0c8cbc7f399964
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Oct 2012 14:55:17 +0000 (07:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib62a767f559495732f3471c59e8017dbef5f950f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Oct 2012 14:53:21 +0000 (07:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a98e5d6a8117c370a3b3bb955f6196311efce79
Auto-generated-cl: translation import
John Hoford [Tue, 23 Oct 2012 03:00:53 +0000 (20:00 -0700)]
am
ea7366a5: am
5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '
ea7366a517c9142a8e35d19a64e9964bb96ad2a8':
on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 02:58:11 +0000 (19:58 -0700)]
am
5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '
5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79':
on entry check if Tiny Planet if not remove UI
John Hoford [Mon, 22 Oct 2012 23:26:26 +0000 (16:26 -0700)]
on entry check if Tiny Planet if not remove UI
bug:
7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
Mangesh Ghiware [Tue, 23 Oct 2012 01:47:28 +0000 (18:47 -0700)]
am
4a138a84: am
63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
* commit '
4a138a84682c3554d553a4909dbf12d48c7ea144':
Add activity-alias for video camera
Mangesh Ghiware [Tue, 23 Oct 2012 01:44:26 +0000 (18:44 -0700)]
am
63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
* commit '
6377075221ef5b31c7f87e7f0103124e5177c2c3':
Add activity-alias for video camera
Mangesh Ghiware [Tue, 23 Oct 2012 01:43:03 +0000 (18:43 -0700)]
Merge "Add activity-alias for video camera" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:05:22 +0000 (18:05 -0700)]
am
0df51da9: am
afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
* commit '
0df51da9b67e1c66f0a85a475ce567c11b8d4aa1':
Minor transition tweaks
Bobby Georgescu [Tue, 23 Oct 2012 01:03:02 +0000 (18:03 -0700)]
am
afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
* commit '
afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c':
Minor transition tweaks
Bobby Georgescu [Tue, 23 Oct 2012 01:00:44 +0000 (18:00 -0700)]
Merge "Minor transition tweaks" into gb-ub-photos-arches
Doris Liu [Tue, 23 Oct 2012 01:00:38 +0000 (18:00 -0700)]
am
7ad3eb28: am
3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
* commit '
7ad3eb28f0ab85669841c1b5589982834b465c1b':
Show panorama thumbs in Gallery grid view
Doris Liu [Tue, 23 Oct 2012 00:57:48 +0000 (17:57 -0700)]
am
3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
* commit '
3a64ad361b9d48407abd902b26949d3c6b34af66':
Show panorama thumbs in Gallery grid view
Doris Liu [Tue, 23 Oct 2012 00:55:57 +0000 (17:55 -0700)]
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 22:28:04 +0000 (15:28 -0700)]
Minor transition tweaks
Bug:
7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
Doris Liu [Sat, 20 Oct 2012 02:16:14 +0000 (19:16 -0700)]
Show panorama thumbs in Gallery grid view
Bug:
7362229
Bug:
7378208
In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.
Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
Hung-ying Tyan [Mon, 22 Oct 2012 23:25:36 +0000 (16:25 -0700)]
am
23cfddb4: am
bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
* commit '
23cfddb44a19683b1f5a61200875048d7b916dd4':
Move new exif lib to gallerycommon.
Hung-ying Tyan [Mon, 22 Oct 2012 23:23:47 +0000 (16:23 -0700)]
am
bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
* commit '
bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468':
Move new exif lib to gallerycommon.
John Reck [Mon, 22 Oct 2012 23:23:10 +0000 (16:23 -0700)]
am
fdfced2d: am
ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
* commit '
fdfced2d4eb28e510926aa704921cfe2d6e170b5':
Drive GLRootView with Choreographer
Hung-ying Tyan [Mon, 22 Oct 2012 23:22:21 +0000 (16:22 -0700)]
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:21:38 +0000 (16:21 -0700)]
am
ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
* commit '
ff4e0460b4cdeb329e37cb5f41eedc45717a17c4':
Drive GLRootView with Choreographer
John Reck [Mon, 22 Oct 2012 23:19:52 +0000 (16:19 -0700)]
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:11:01 +0000 (16:11 -0700)]
Drive GLRootView with Choreographer
Bug:
7332724
By routing requestRender through postOnAnimation we can drive
the GLRootView's rendering with the UI thread's coreographer, which
ensures that touch events are processed before drawing
Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
Bobby Georgescu [Mon, 22 Oct 2012 22:59:10 +0000 (15:59 -0700)]
am
b21c127c: am
e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
* commit '
b21c127cf83ccc1bd86deb3fb35fea974e69957c':
Scroll to placeholder in gallery filmstrip launches camera
Bobby Georgescu [Mon, 22 Oct 2012 22:56:08 +0000 (15:56 -0700)]
am
e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
* commit '
e96e907a01c0d633828dade014f07a5b93b07356':
Scroll to placeholder in gallery filmstrip launches camera
Bobby Georgescu [Mon, 22 Oct 2012 22:53:30 +0000 (15:53 -0700)]
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
Mangesh Ghiware [Mon, 22 Oct 2012 22:47:22 +0000 (15:47 -0700)]
Add activity-alias for video camera
Bug:
7390076
Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357
Ruben Brunk [Mon, 22 Oct 2012 22:25:37 +0000 (15:25 -0700)]
am
91814c2e: am
168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
91814c2e343b9a0b602e38816047bfd7cb58007c':
Fix geometry xforms & minor bug.
Ruben Brunk [Mon, 22 Oct 2012 22:22:45 +0000 (15:22 -0700)]
am
168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
168db2f10069c3a15a9c3b9d0325cac0ae779b99':
Fix geometry xforms & minor bug.
Ruben Brunk [Mon, 22 Oct 2012 22:20:55 +0000 (15:20 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 22:11:03 +0000 (15:11 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Bobby Georgescu [Mon, 22 Oct 2012 20:49:35 +0000 (13:49 -0700)]
Scroll to placeholder in gallery filmstrip launches camera
Bug:
7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
Bobby Georgescu [Mon, 22 Oct 2012 21:52:33 +0000 (14:52 -0700)]
am
cfbbe15d: am
3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
* commit '
cfbbe15d8b927d3be388340c62cee5e5b3af850f':
Increase album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:50:22 +0000 (14:50 -0700)]
am
3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
* commit '
3536bd340f43edfc9f318df5f49e9319e62d0cc4':
Increase album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:48:42 +0000 (14:48 -0700)]
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
George Mount [Mon, 22 Oct 2012 21:39:41 +0000 (14:39 -0700)]
am
f2272574: am
58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '
f2272574dcefc4e1f369fbf0de55559d1548c741':
Add null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 21:37:09 +0000 (14:37 -0700)]
am
58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '
58d326ea368ae275f03ec158a9ec5f9d2965593a':
Add null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 21:32:05 +0000 (14:32 -0700)]
am
1d25a687: (-s ours) am
73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
1d25a68700185f2126dc387a28c0d966853e8776':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 21:29:55 +0000 (14:29 -0700)]
am
73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
73c89b45b122cbdcbcffa618f0fa2386829d710a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 21:29:36 +0000 (14:29 -0700)]
am
2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2ed15703c06d1b4691737475f127eecbffa056e9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 21:27:35 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
OSDN Git Service
