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

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

am 3f622aae: am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet

* commit '3f622aaec2b0af05e6ad8fef4b394a5ea9865586':

commit | commitdiff | tree

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

am 11d32976: am e3642a33: am 73a2ad06: am e7a71372: Fix update view

* commit '11d329766e525b58e08f8a4fc84ad150d1eba718':

commit | commitdiff | tree

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

am ef6d3c66: am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'ef6d3c66eacce78664f27ff1551b441158dd3d93':

commit | commitdiff | tree

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

am f7b7880d: am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit 'f7b7880dcbb5232486becc12ff18dc47b6bebb4c':

commit | commitdiff | tree

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

am ebcccd9f: am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit 'ebcccd9ff866c7746e97c78928a887f7270658b4':

commit | commitdiff | tree

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

am 73331693: am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view

* commit '73331693f92d076a9c2abe9a7ce471b0f8957be6':

commit | commitdiff | tree

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

am 61124cb3: am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff

* commit '61124cb3de442cdaa9dddecc17d5ff443ccb84ee':

commit | commitdiff | tree

Teng-Hui Zhu [Mon, 5 Nov 2012 23:53:04 +0000 (15:53 -0800)]

am 001cef5c: am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit '001cef5c6c5382d910cf514da166a65976559e0e':

commit | commitdiff | tree

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

am 4fe1c262: am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors

* commit '4fe1c2620194fd3c5e4510ed6684356f52262ab9':

commit | commitdiff | tree

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

am ab923576: am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit 'ab9235763354d466fd8e03ed7ef149133f61c8c9':

commit | commitdiff | tree

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

am 46aff56a: am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task

* commit '46aff56a3d7aad48fd8d4b919450b3ad0f20438f':

commit | commitdiff | tree

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

am 90e04d85: am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip

* commit '90e04d85a3b66053162f65914948570101d4794a':

commit | commitdiff | tree

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

am 0cb37459: am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.

* commit '0cb374592fa7fff59ffacf2956c86ef066e08917':

commit | commitdiff | tree

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

am 34457449: am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit '3445744996b8f525eef4d6c456fe11471ebe2acc':

commit | commitdiff | tree

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

am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit '27fd152da0547ae8f9e9d503ed544308a16df131':

commit | commitdiff | tree

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

am c054647b: am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit 'c054647b815489a0c020c2b1371eeb3b508f70db':

commit | commitdiff | tree

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

am 686dea53: am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '686dea53d52c1f896aae76c09243b80dec821181':

commit | commitdiff | tree

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

am a6b039ac: am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'a6b039ac51b195e8c4e0ebc152741d61c6ce1c6b':

commit | commitdiff | tree

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

am 5da1c942: am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit '5da1c942ad9040d00973be2c650759fbfba7e73b':

commit | commitdiff | tree

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

am 8be75158: am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails.

* commit '8be75158b280033edf433b38e7f6d2a3eb7fd525':

commit | commitdiff | tree

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

am 0a0667cc: am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.

* commit '0a0667cc27cdd8c78f47f81bc46fadaad496dd75':

commit | commitdiff | tree

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

am 68ba0176: am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit '68ba01764945e4aa5d8e2caf389da0cdda53a42f':

commit | commitdiff | tree

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

am cf083183: am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit 'cf08318347c43e49658a630042c66cdc6c53b73b':

commit | commitdiff | tree

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

am 0dc0943f: am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit '0dc0943f0293d62b7d056f995fb7253847537bc1':

commit | commitdiff | tree

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

am 68f5000e: am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit '68f5000e4e76dc01174c95f9758ced1d0de842a5':

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

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

am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet

* commit '9ed116642f07ae6a52be132077fcdfb2790a4758':

commit | commitdiff | tree

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

am e3642a33: am 73a2ad06: am e7a71372: Fix update view

* commit 'e3642a3362e1e6fbdcc0b4ffb0963657f4e1caf0':

commit | commitdiff | tree

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

am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'd491af093d8614e33b89bccaa1db030128eaaa25':

commit | commitdiff | tree

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

am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit 'fb49447912a3acf5bbadcfcb696a282b6765b05f':

commit | commitdiff | tree

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

am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit 'a9bc6deb8e4eb9e57b13d83a33251e62d6a87e01':

commit | commitdiff | tree

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

am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view

* commit 'c6b4ecf682ce95e5b5a725fa8c8fdf61bad79c83':

commit | commitdiff | tree

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

am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff

* commit 'e8df5a6da384b8c6b7dc86ea4c880d691359422b':

commit | commitdiff | tree

Teng-Hui Zhu [Mon, 5 Nov 2012 23:49:37 +0000 (15:49 -0800)]

am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit '0a82481b7375efcbf07e677e2682be166d58a001':

commit | commitdiff | tree

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

am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors

* commit 'a19301bba9c02be5c2b3d8d1460286d84022f610':

commit | commitdiff | tree

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

am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit 'f254567f344826e3398a645cd0c87012653d184f':

commit | commitdiff | tree

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

am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task

* commit 'd2173fc83d62caac54ec659a961a859dc18321b6':

commit | commitdiff | tree

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

am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip

* commit 'a8227bbee10f8aabff550c4baca09247985ca775':

commit | commitdiff | tree

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

am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.

* commit '0b549f611c7d220355fb455dbff2c2d7f876cead':

commit | commitdiff | tree

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

am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit 'fbe416ada2674df7c5488b693d88602da0d761c2':

commit | commitdiff | tree

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

am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit '9da23648df344bd4bcc3d4ce8243936e5353aaf3':

commit | commitdiff | tree

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

am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit '624ad6d08fc12169a1cbdd2013496de93fdb72c7':

commit | commitdiff | tree

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

am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5b41962e717d65f6b4db37300ca274fd62c6df91':

commit | commitdiff | tree

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

am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5c9c8ac303db6f29abae6b3180a1d377d71e66fa':

commit | commitdiff | tree

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

am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit '03470f4ce6b931cdf0a388f6b5174f3f53afa9a0':

commit | commitdiff | tree

Owen Lin [Mon, 5 Nov 2012 23:49:21 +0000 (15:49 -0800)]

am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails.

* commit '2fc6e3a55c29fe214b7c975b9ba798e14dca62b4':

commit | commitdiff | tree

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

am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'a03998c9adb9a0b53696d64c666fc7e39fa7292d':

commit | commitdiff | tree

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

am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'b004a6f93a883887b73e98fd5191689f9890290e':

commit | commitdiff | tree

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

am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit 'f60139cee9f3db343e378547b27dfb68377a486d':

commit | commitdiff | tree

Nicolas Roard [Mon, 5 Nov 2012 23:49:16 +0000 (15:49 -0800)]

am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit 'c0c5c138068a8d5b0b5db2c7583f0bcf5074be71':

commit | commitdiff | tree

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

am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit 'c3d2b085294e28adf3f41e2e26b3261415ce8f85':

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

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

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

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':