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

Baligh Uddin [Tue, 6 Nov 2012 00:01:02 +0000 (16:01 -0800)]

am 5bfbac9f: am 990cdc38: am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5bfbac9f362b807d2ad5a93a6535c4bade10b06f':

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Nov 2012 00:01:01 +0000 (16:01 -0800)]

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

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

commit | commitdiff | tree

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

am 963c8007: am bfd77884: am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '963c800786a7826df1803b85aca3b355bafd6320':

commit | commitdiff | tree

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

am 215ab980: am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '215ab980e7f880e316cb405c6d79f5a383877217':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Wu-cheng Li [Mon, 5 Nov 2012 23:59:35 +0000 (15:59 -0800)]

am f143f5d8: am 585638c0: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest.

* commit 'f143f5d86826506a72b985a6e89ed53544ed1c60':

commit | commitdiff | tree

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

am 5019393a: am 04024d64: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem

* commit '5019393a4e773080add5623aa5b0b56cee0c512e':

commit | commitdiff | tree

Tenghui Zhu [Mon, 5 Nov 2012 23:59:31 +0000 (15:59 -0800)]

am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '50d8215190ced5537ef477b2721cfde053cb1848':

commit | commitdiff | tree

Bart Sears [Mon, 5 Nov 2012 23:59:30 +0000 (15:59 -0800)]

am df8605ba: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b':

commit | commitdiff | tree

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

am d96fb3ee: am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit 'd96fb3ee6a0c993e719798b368986cb68a93ceb2':

commit | commitdiff | tree

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

am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '4eb23cf3f3d1a4120d717dca126d70ff15c3bde2':

commit | commitdiff | tree

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

am 1ed82061: am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '1ed8206143ab7e60e5b3c92cc434562797e116fe':

commit | commitdiff | tree

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

am cfaea9f2: am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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

commit | commitdiff | tree

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

am 990cdc38: am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '990cdc3814c7144420feff769434185e0a323f65':

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

am bfd77884: am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'bfd77884974cbd1a29028156d9af9b67e6359696':

commit | commitdiff | tree

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

am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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

commit | commitdiff | tree

Wu-cheng Li [Mon, 5 Nov 2012 23:57:07 +0000 (15:57 -0800)]

am 585638c0: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest.

* commit '585638c08b9bb8c0a89dca412252e07b45b193d8':

commit | commitdiff | tree

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

am 04024d64: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem

* commit '04024d6477cbbb60f3dabbcef34aada84672fb94':

commit | commitdiff | tree

Tenghui Zhu [Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)]

am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '2f09f14ea0b9314fe3ad69a54866ddfa383c8c82':

commit | commitdiff | tree

Bart Sears [Mon, 5 Nov 2012 23:57:03 +0000 (15:57 -0800)]

am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit '368127e5815811ffdc9181ca9ba4114c5b27a412':

commit | commitdiff | tree

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

am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit '59e23832fc445d98d2843e5fcef378c8a20a6e71':

commit | commitdiff | tree

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

am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'ff601b2348e0740ab794a1c92f43c5d3219bd87f':

commit | commitdiff | tree

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

am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2bd00f793ffe9d20ec117515812cc4e534a5d876':

commit | commitdiff | tree

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

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

* commit '06e7810cb3467ef99623826d662d18cc5ae64330':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

am abfa44cd: am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'abfa44cd01ef313368d86261462d9cf7de4deb7f':

commit | commitdiff | tree

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

am 61529fbc: am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '61529fbca43ab4be49c26a94c08e1f51813c675d':

commit | commitdiff | tree

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

am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '1d4ef5045715e07bb34c8c94c00cc783502e3cb8':

commit | commitdiff | tree

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

am 73e7d153: am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit '73e7d153fb290122652062ea221a17e9a7e05712':

commit | commitdiff | tree

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

am 783e171c: am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE

* commit '783e171c00f6dad5fad2c73489d1716ecde690cd':

commit | commitdiff | tree

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

am bddbc50f: am 68983489: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '039e80be8d5c7fabfd8e168d5e86ce83b33fb916':

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'ded6d0fe3d87b64f30de5add511bfd24a7d0382d':

commit | commitdiff | tree

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

am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '2147266dc65bd95d5603c53fe23e77e136fa68f4':

commit | commitdiff | tree

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

am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '6f444bb46565e5f3142c16c2a3f7ebcdcafd90cd':

commit | commitdiff | tree

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

am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit 'cbf27c9661d34b9f334af225bee356f29ad4aa17':

commit | commitdiff | tree

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

am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE

* commit '3540bf03ffea7b52fe43c9029e3a07f0b3cd09a2':

commit | commitdiff | tree

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

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

* commit '68983489dbd8310e25339b1a7988c6ba167a3795':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

am 16f8aa84: am fc8e6db7: am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '16f8aa849ac14a2bde2f3d06deaa4db7bd368108':

commit | commitdiff | tree

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

am 82d5861e: am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '82d5861ef0874fdc02c5c151b67a96620e02b00f':

commit | commitdiff | tree

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

am ed035ad1: am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'ed035ad14569dd55234026f816e61089a077b0c5':

commit | commitdiff | tree

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

am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '1dbf0ed94c0355b6abdde6556f4bdcca317220e4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

am 10d9ad75: am c2931f8e: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '10d9ad75ea171d3877dd769fc548faa8d4297e36':

commit | commitdiff | tree

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

am ef70f937: am 92503c9e: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit 'ef70f93739398cef2d2b9975f15314351e079c75':

commit | commitdiff | tree

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

am 538d47a8: am e5ac5d03: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit '538d47a8229adf6ccf3ab970fbc0905093d7532f':

commit | commitdiff | tree

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

am 6ffd2096: am 4fc2db3c: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit '6ffd20961377a3fe7387e44ca8e590fc8f9c23b2':

commit | commitdiff | tree

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

am 9041daac: am 9f039e39: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit '9041daacefa2d8655fb8b717aa853d4b99574de8':

commit | commitdiff | tree

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

am 01b92c5f: am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '01b92c5fd6831b90084111893bd4bbb2ec5ba8b0':

commit | commitdiff | tree

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

am 8bab921b: am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '8bab921b45e20d23a709091c8fa0a4318cba4944':

commit | commitdiff | tree

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

am 49f0a0a9: am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit '49f0a0a9e4e0b0e93c3c9c883c9110c308596570':

commit | commitdiff | tree

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

am 46d65dc0: am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror

* commit '46d65dc0be97ed7cbf41c824fdecbb3709fc712e':

commit | commitdiff | tree

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

am 891ff2db: am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '891ff2db8d5e0115f8f234732dd4fc8ece2f01a0':

commit | commitdiff | tree

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

am e31b12f1: am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit 'e31b12f172e45b447994f391eaedcaee58c0d687':

commit | commitdiff | tree

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

am 86d47b9a: am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '86d47b9a689dac8424311628cf9ced8a639a1c8c':

commit | commitdiff | tree

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

am f065bbbc: am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit 'f065bbbc7cfca42cea5f6760c82b57ac74a453ae':

commit | commitdiff | tree

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

am 874d36e4: am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '874d36e4269b27e9e8dcb80341b38de1d3f41070':

commit | commitdiff | tree

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

am a1f8faeb: am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit 'a1f8faebb38d349890f7f975926d8ff16bad296f':

commit | commitdiff | tree

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

am 2f5fceb7: am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit '2f5fceb76625e24bf07234506a5b7590a1fe821c':

commit | commitdiff | tree

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

am 28f3fb0f: am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '28f3fb0f9541d992c18c4eae26fdd261968d5cd2':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:53:24 +0000 (15:53 -0800)]

am f96ce7f1: am b83e3632: am f38cb998: Fix conflict with other build fix

* commit 'f96ce7f1591060e99dd8d6d5bdb25e162dd29706':

commit | commitdiff | tree

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

am 4554d9f5: am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '4554d9f5196a2b39fdb31b944611f2b2d0d9fb37':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:53:18 +0000 (15:53 -0800)]

am 645a8682: am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '645a868259c9e7668868f6fecedc8d65853b2344':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:53:16 +0000 (15:53 -0800)]

am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '12aa029dd90d324f30e63308329e0436408211a1':

commit | commitdiff | tree

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

am 56edac84: am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor

* commit '56edac84dccbdc97bceefa21e17ab75febfc8f6e':

commit | commitdiff | tree

Angus Kong [Mon, 5 Nov 2012 23:53:14 +0000 (15:53 -0800)]

am 659fd380: am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation.

* commit '659fd38058feb98b6ded74baf49d4ca0c11cc51a':

commit | commitdiff | tree

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