git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Ruben Brunk [Mon, 5 Nov 2012 23:56:48 +0000 (15:56 -0800)]

am 200e37fd: am 307eecfc: am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit '200e37fd4664c61d04578a98104a29e5b33dd8b1':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:47 +0000 (15:56 -0800)]

am b8965012: (-s ours) am 96ea647f: am e1036a50: Import translations. DO NOT MERGE

* commit 'b8965012700de2dfb3ddf4982f33ee9a22f8bcd1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:56:45 +0000 (15:56 -0800)]

am 1f52b30b: am 92ea0a90: am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit '1f52b30b5a006625caff7a35f0d05680ae170bf5':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:56:43 +0000 (15:56 -0800)]

am 5534e7b9: am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '5534e7b90aa3d5c397aabbdbe9c4e400fd06680d':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:56:42 +0000 (15:56 -0800)]

am 262cea15: am d79cd799: am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit '262cea15333bb407c30cbf56c2182cbcc932b4a2':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:41 +0000 (15:56 -0800)]

am 8c3f8d73: am 1ce091fb: am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit '8c3f8d739aaa71da2940cea6e1ca05e0e2ed6709':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:39 +0000 (15:56 -0800)]

am 58e93517: am aeff41bd: am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit '58e93517ddbb04b57b7150c2ffd3192e3de84ab3':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:56:38 +0000 (15:56 -0800)]

am 25df492e: am e3e394a4: am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '25df492e4f885f6f398deeb735df1229208f0a52':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:56:36 +0000 (15:56 -0800)]

am 4d6c4c61: am b4bbd952: am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '4d6c4c61237901c0ebb57cef1b2761107fb23b67':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:34 +0000 (15:56 -0800)]

am dcfb900a: am a41df7c2: am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'dcfb900ad1e248b9774698798f0a5a907cff8a08':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:56:33 +0000 (15:56 -0800)]

am 3a493702: am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '3a493702fa0df517b1ee5f9f66672fe5a3b50d01':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:31 +0000 (15:56 -0800)]

am a7fe97bf: am d6bb72ec: am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit 'a7fe97bf11a17126f9ce113959b1009f572b4bf4':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:29 +0000 (15:56 -0800)]

am f1644cf6: am cac3cd19: am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit 'f1644cf629c86dfc8b5cc92793fcc71d9ece1084':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:56:27 +0000 (15:56 -0800)]

am 615b7db5: am e7e7059b: am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '615b7db57d811c05562e15837fe2ea902b32c10e':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:25 +0000 (15:56 -0800)]

am a9d22064: am 1c196316: am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'a9d2206470d3202e5a376baf47a4fef69fc2e7b1':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:24 +0000 (15:56 -0800)]

am b121e1a7: am a357260f: am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'b121e1a7020b54a2379f0e4f173096f686d96e1e':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:23 +0000 (15:56 -0800)]

am 80f880b8: am 0888dd02: am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '80f880b89bbb60f51b28f8dd4904221439b5d84f':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:56:21 +0000 (15:56 -0800)]

am 783729fd: am 79a50cad: am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '783729fd7cc3183a206a9fc2bda7d307be4978ec':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:16 +0000 (15:56 -0800)]

am a34b0472: (-s ours) am 4a831f74: am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit 'a34b0472158de0fa4108b2badb9a99c3e1fe0108':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:15 +0000 (15:56 -0800)]

am 1cef81ac: (-s ours) am d5017721: am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE

* commit '1cef81acf93c6ac3c43f8bbac45ab7048ff4c878':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:13 +0000 (15:56 -0800)]

am 263a27b9: (-s ours) am c1f46437: am 69cec707: (-s ours) Import translations. DO NOT MERGE

* commit '263a27b9d6e4cd51c69de523c85d7051ff5fcf9e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:52:42 +0000 (15:52 -0800)]

am 307eecfc: am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit '307eecfc26b85eaa9bd2d936479e0d01a7ebb173':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:52:41 +0000 (15:52 -0800)]

am 96ea647f: am e1036a50: Import translations. DO NOT MERGE

* commit '96ea647f63fa7e996adfe865df65bc6e2723bf5b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:52:39 +0000 (15:52 -0800)]

am 92ea0a90: am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit '92ea0a9033de6b620adcdb348107aa2f7bcd0e17':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:52:38 +0000 (15:52 -0800)]

am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '56311a81651dd90b47440f8db58cb78652b38f22':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:52:37 +0000 (15:52 -0800)]

am d79cd799: am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'd79cd799a92041d893e622a8fa831b0e0839ee6c':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:36 +0000 (15:52 -0800)]

am 1ce091fb: am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit '1ce091fb82de31d685e5306b3ecb1c068cfdd62d':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:34 +0000 (15:52 -0800)]

am aeff41bd: am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'aeff41bd96846a7fa61a9642387fd588020d2366':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:52:33 +0000 (15:52 -0800)]

am e3e394a4: am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit 'e3e394a40f49d2431568cc1c8414de69ede238f1':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:52:32 +0000 (15:52 -0800)]

am b4bbd952: am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit 'b4bbd952175778dbf65647adb9b0429dcbff27d9':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:30 +0000 (15:52 -0800)]

am a41df7c2: am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'a41df7c2b57e8931a0d1d91d9bf1b03453938095':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:52:29 +0000 (15:52 -0800)]

am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '80fd6f773239bba239af22c07d519a71da6e1d0d':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:28 +0000 (15:52 -0800)]

am d6bb72ec: am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit 'd6bb72ecad476fafdf05d03bbfc861335ff839a6':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:26 +0000 (15:52 -0800)]

am cac3cd19: am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit 'cac3cd19bb90f7e1b9a7638dc4384d6ca0ca1544':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:52:25 +0000 (15:52 -0800)]

am e7e7059b: am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'e7e7059b820d8a2ed7d80da4a2764f67330c0eb1':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:24 +0000 (15:52 -0800)]

am 1c196316: am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices

* commit '1c19631677766104773e648e9e47792331aa02ec':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:23 +0000 (15:52 -0800)]

am a357260f: am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'a357260f8cee02f5875a01bc5f2f6eabbb221489':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:52:21 +0000 (15:52 -0800)]

am 0888dd02: am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '0888dd02a6fe6d4c22c2fb16082dd9c74d75fbba':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:52:20 +0000 (15:52 -0800)]

am 79a50cad: am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '79a50cad0ae7c228fa6ae438136f8a8fcae0eddb':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:52:19 +0000 (15:52 -0800)]

am 4a831f74: am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '4a831f74737ecf64d90787edc8d5321ef602bfc9':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:52:17 +0000 (15:52 -0800)]

am d5017721: am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE

* commit 'd5017721c42a2a844e50ee04fe69a37ad3306d2c':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:52:16 +0000 (15:52 -0800)]

am c1f46437: am 69cec707: (-s ours) Import translations. DO NOT MERGE

* commit 'c1f46437885bc3da1f799d3a57fdd599bcb4f3df':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:50:42 +0000 (15:50 -0800)]

am df5f199e: am c7374d5c: am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit 'df5f199e81d1139441bbf321ed853d914e33695d':

commit | commitdiff | tree

Mangesh Ghiware [Mon, 5 Nov 2012 23:50:41 +0000 (15:50 -0800)]

am d60a97b1: am d0f09548: am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit 'd60a97b118c9ced1be8dc4c9c2d5a43ee968f595':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:50:40 +0000 (15:50 -0800)]

am a3b3ae04: am 33949fc8: am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit 'a3b3ae04b27db9f47ebe57641bf01aa14ea4eed2':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:50:38 +0000 (15:50 -0800)]

am dd249883: am 449cd606: am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit 'dd24988323f9eb334a983df98608c2b0ebf2d9e9':

commit | commitdiff | tree

Hung-ying Tyan [Mon, 5 Nov 2012 23:50:37 +0000 (15:50 -0800)]

am dcdf6ee8: am 0033497c: am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'dcdf6ee8c0755cc4ba690e9494e1e2870be697eb':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:50:35 +0000 (15:50 -0800)]

am 3b2d7dd2: am 4e728e9f: am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit '3b2d7dd2ddab899c447ce7be2518597f63016858':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:50:34 +0000 (15:50 -0800)]

am e1e80a49: am 96487845: am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'e1e80a49e1ca2003caae1cbcc61c1b0a53bef01d':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:50:32 +0000 (15:50 -0800)]

am 3f12b3db: am 5f83eeb8: am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '3f12b3db03c8623a277791106c6f2c4f7902c692':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:50:31 +0000 (15:50 -0800)]

am 3ccd8f1c: (-s ours) am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '3ccd8f1c3b507aafacf7d7dde2c54ffc0c9ed519':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:49:13 +0000 (15:49 -0800)]

am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit 'd8ddd8d841da84973f451e2aca7a4f871b2861ca':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:49:12 +0000 (15:49 -0800)]

am e1036a50: Import translations. DO NOT MERGE

* commit 'e1036a509ec62c1d9146ca72e3a39313d0310a2d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:49:10 +0000 (15:49 -0800)]

am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit '2fe28fc3042ee411d46e581a24a64e073d6d4e2a':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:49:09 +0000 (15:49 -0800)]

am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit 'ea4097c9ac4f3b56c065eaaf8b72bc0ee3743b0f':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:49:08 +0000 (15:49 -0800)]

am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'beda88a7038e82565011c26804940f25f3fd789a':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:49:06 +0000 (15:49 -0800)]

am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit '7c30dc018590fc3b44fb1f208e121470ef0aac9d':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:49:05 +0000 (15:49 -0800)]

am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit '808a5869a56f8a3671f7c80c319dff6b94ea7915':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:49:03 +0000 (15:49 -0800)]

am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '590acf8681c11395e9b9548e4cd8a205902cbb35':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:48:59 +0000 (15:48 -0800)]

am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '0827ebf079934ae9e6cb7285e785a1a179f155fa':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:56 +0000 (15:48 -0800)]

am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit '30fd4b427eb84d553dfcae3759707f9d8da75001':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:48:55 +0000 (15:48 -0800)]

am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '22fae1820b13017c121879774b0afd522ecee676':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:54 +0000 (15:48 -0800)]

am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit '05757033049bd84e44f695ca781889d44577c589':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:52 +0000 (15:48 -0800)]

am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '4626ebd1e289777868f33abb5e0b3a4bc116961e':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:48:51 +0000 (15:48 -0800)]

am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '75a448eb193308f6b9268968265895c019ae3ab2':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:50 +0000 (15:48 -0800)]

am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'b8f4ea38c6096cb806b60986c0d11ef9761db665':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:48 +0000 (15:48 -0800)]

am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'c54c78392cc9007be5a9f0cd2bf7d003a883a6ff':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:48:47 +0000 (15:48 -0800)]

am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit 'cd35c2fc673f455de2d5853ecf1248d8ff167742':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:48:46 +0000 (15:48 -0800)]

am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit 'b2fb154fa84ec663bb8e181c299a3868e9ee98aa':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:48:44 +0000 (15:48 -0800)]

am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)]

am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE

* commit 'e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:48:41 +0000 (15:48 -0800)]

am 69cec707: (-s ours) Import translations. DO NOT MERGE

* commit '69cec707836ae8c072da9e0015160b96a5c5c6be':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:47:44 +0000 (15:47 -0800)]

am c7374d5c: am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit 'c7374d5c1a2378a685a0cf55a42331429d5b2573':

commit | commitdiff | tree

Mangesh Ghiware [Mon, 5 Nov 2012 23:47:43 +0000 (15:47 -0800)]

am d0f09548: am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit 'd0f095482e9ce76ae4dd3d588aefa671b40a22c4':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:47:42 +0000 (15:47 -0800)]

am 33949fc8: am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit '33949fc8394ee2601ebb4737106c04e4333551d1':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:47:41 +0000 (15:47 -0800)]

am 449cd606: am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '449cd6064b4035ba8e7a00e0bcfcd0a761f68c0d':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:47:41 +0000 (15:47 -0800)]

am 23ce5952: am 7b3f7fd3: am 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '23ce59522c304e7c837efe2dac725fcda7a97079':

commit | commitdiff | tree

Hung-ying Tyan [Mon, 5 Nov 2012 23:47:40 +0000 (15:47 -0800)]

am 0033497c: am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit '0033497c076ea9c259f97f55a015883047a00af2':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:47:40 +0000 (15:47 -0800)]

am f569f0a8: am 71aa2e84: am d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit 'f569f0a8872a8ef9fb9cd10b8092a3e0487056ec':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:47:39 +0000 (15:47 -0800)]

am aa49998f: (-s ours) am bbd2b8ce: am 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'aa49998fc3dc5d1a7002a922bbba661cf0b4037d':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:47:36 +0000 (15:47 -0800)]

am 4e728e9f: am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit '4e728e9faaab24af36e0d8becde0680d5fb5aae4':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:47:34 +0000 (15:47 -0800)]

am 96487845: am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit '96487845c34d3dd35f23cd35cf401a9e2c1a7b64':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:47:34 +0000 (15:47 -0800)]

am 8610cc6d: (-s ours) am afa18f16: am e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8610cc6da6a27c875a9a83b76cfb52efcccc4357':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:47:33 +0000 (15:47 -0800)]

am 5f83eeb8: am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '5f83eeb89ddcb25202b24a82fa9bfa4fef35925c':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:47:29 +0000 (15:47 -0800)]

am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '2ef3999af3edcc146b9c5255c7474f3dbc4d998f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:45:58 +0000 (15:45 -0800)]

am 44c66932: am aa43c5e0: am e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '44c66932842f16aaacea084b2b63ea3e964b33f7':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:45:57 +0000 (15:45 -0800)]

am 030d67db: am 4bffa066: am 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '030d67db59b927d233ef6804795810759b8ea9bd':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:56 +0000 (15:45 -0800)]

am f25c3699: am 8d765a3e: am 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit 'f25c3699581eccad74f028870605a1d199bda402':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:45:55 +0000 (15:45 -0800)]

am 774843c0: am f38acfe2: am 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches

* commit '774843c08bc87e3b5e1500210337d25ff9dd41a7':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:54 +0000 (15:45 -0800)]

am 1c528ad8: am 40c5b8a3: am 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up

* commit '1c528ad8f1049f026b442af64be64a22d9aabb62':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:53 +0000 (15:45 -0800)]

am 6a54ad86: am e9de627f: am 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module

* commit '6a54ad8632077cd85061797ec7c9ae2456fe3435':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:51 +0000 (15:45 -0800)]

am fa5585d9: am 5ad56e6e: am 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten

* commit 'fa5585d98368fcdc79060156b442727a1c7be232':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:50 +0000 (15:45 -0800)]

am 443ece63: am e1afb724: am 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to.

* commit '443ece63295326b86147028a5196a57ecd81a97a':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:49 +0000 (15:45 -0800)]

am 1637623a: am 2b8ef050: am 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

* commit '1637623ab5cc92079aa55c2130a6d4f2a58d68b7':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:45:48 +0000 (15:45 -0800)]

am d53c1125: am e7101a7f: am eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera

* commit 'd53c11255af42caf4cdfa35f6137a6dcebd425d1':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:45:47 +0000 (15:45 -0800)]

am 4a0252da: am 2a227625: am 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter.

* commit '4a0252da46b1b0642f63bc6bbcf219fb10f709d1':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:45:46 +0000 (15:45 -0800)]

am 333f9c25: am e59ad376: am 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet

* commit '333f9c25ec076c84771d5b92831e498fccebf08d':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:45:44 +0000 (15:45 -0800)]

am 36e14657: am e07079e9: am c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip

* commit '36e146572e5cbf356da5e28bf3d5613c5d1a1cf1':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:45:43 +0000 (15:45 -0800)]

am acb4c616: am 2465f514: am 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches

* commit 'acb4c6162f009e704bfb8de6b7f9d9aee1cc06ea':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:45:42 +0000 (15:45 -0800)]

am acb317b8: am 57e99ca7: am 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode.

* commit 'acb317b8e7eb3379fac6448c191388bcd93593e9':