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

John Reck [Mon, 8 Oct 2012 23:22:38 +0000 (16:22 -0700)]

am 2175d23f: am c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation

* commit '2175d23f85003cc3a3f212821382401da7c565ec':
Use framework orientation

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 23:22:32 +0000 (16:22 -0700)]

am 39f698df: am fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit '39f698df3ec41e31a26dd2d12e89bda1479ec6da':
Fix the filtershow activity to portrait

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 23:22:30 +0000 (16:22 -0700)]

am fca8cff2: am 932f3da6: am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit 'fca8cff29d0daa80694648196b9aaad75a0f5f86':
add redeye and improve shadow removal

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 23:21:55 +0000 (16:21 -0700)]

am ee7646d4: am 341335c1: am 05ae0806: am 639095c6: Correct undo behavior

* commit 'ee7646d4f150c3090f7b1a805957c275f8df655a':
Correct undo behavior

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 23:21:47 +0000 (16:21 -0700)]

am 4c6bb634: am 8fd2a1e8: am 0efc1133: am 7bd60250: Added stub for applying geometry flip.

* commit '4c6bb634926327c78f46c3bd36bfe6d5544e6a46':
Added stub for applying geometry flip.

commit | commitdiff | tree

John Reck [Mon, 8 Oct 2012 22:30:41 +0000 (15:30 -0700)]

am c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation

* commit 'c7b7c342a26452d89747d92dd7a847a4f2a67aa4':
Use framework orientation

commit | commitdiff | tree

John Reck [Mon, 8 Oct 2012 22:28:50 +0000 (15:28 -0700)]

am 73d3785c: am a29eeac8: Use framework orientation

* commit '73d3785cf92da3cc81ea75f44ab1eb34294655fd':
Use framework orientation

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 22:27:45 +0000 (15:27 -0700)]

am fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit 'fe9c82cff36c778ab8f853cd8b303519458ded78':
Fix the filtershow activity to portrait

commit | commitdiff | tree

John Reck [Mon, 8 Oct 2012 22:26:54 +0000 (15:26 -0700)]

am a29eeac8: Use framework orientation

* commit 'a29eeac8993b221d98cffbec5583b5cba1921c89':
Use framework orientation

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 22:25:49 +0000 (15:25 -0700)]

am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit '821b775d7790fd3c9bc2a098294a9ac3a49af0f9':
Fix the filtershow activity to portrait

commit | commitdiff | tree

John Reck [Mon, 8 Oct 2012 21:52:07 +0000 (14:52 -0700)]

Use framework orientation

Bug: 7292373

Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 22:23:29 +0000 (15:23 -0700)]

am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

* commit '8eb8c39a4820f04f9fc5f1edcea73670ee0b913c':
Fix the filtershow activity to portrait

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 22:23:14 +0000 (15:23 -0700)]

am 932f3da6: am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit '932f3da67a204bdb8371ebeae588176d56be9279':
add redeye and improve shadow removal

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 22:22:21 +0000 (15:22 -0700)]

am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit '3122f4d1eba587749a790f28cf3a91694bbf6307':
add redeye and improve shadow removal

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 22:21:59 +0000 (15:21 -0700)]

Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 22:21:20 +0000 (15:21 -0700)]

am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit '1a291db030b2f3f7752026dd347ec34b82f8891e':
add redeye and improve shadow removal

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 22:19:55 +0000 (15:19 -0700)]

Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 22:15:29 +0000 (15:15 -0700)]

am 341335c1: am 05ae0806: am 639095c6: Correct undo behavior

* commit '341335c1afd14dac36c4c74297da16e41b033c39':
Correct undo behavior

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 22:03:27 +0000 (15:03 -0700)]

am 05ae0806: am 639095c6: Correct undo behavior

* commit '05ae08060173934dcd180b6de2a1d7c5b1d0d7ca':
Correct undo behavior

commit | commitdiff | tree

John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]

add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681

commit | commitdiff | tree

nicolasroard [Mon, 8 Oct 2012 22:00:39 +0000 (15:00 -0700)]

Fix the filtershow activity to portrait

bug:7279214

Stop-gap for factory rom.

Change-Id: I6073d148dff1016577244cf26c7048ca00d58a54

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 22:02:09 +0000 (15:02 -0700)]

am 639095c6: Correct undo behavior

* commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1':
Correct undo behavior

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 20:37:41 +0000 (13:37 -0700)]

Correct undo behavior

Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 21:29:20 +0000 (14:29 -0700)]

am 8fd2a1e8: am 0efc1133: am 7bd60250: Added stub for applying geometry flip.

* commit '8fd2a1e873305e8a74a2a08fff235d4ec580869a':
Added stub for applying geometry flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 21:27:28 +0000 (14:27 -0700)]

am 0efc1133: am 7bd60250: Added stub for applying geometry flip.

* commit '0efc1133fa3c8f512ef6adccf0fefc291ebe36f1':
Added stub for applying geometry flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 21:25:49 +0000 (14:25 -0700)]

am 7bd60250: Added stub for applying geometry flip.

* commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd':
Added stub for applying geometry flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:48:46 +0000 (13:48 -0700)]

Added stub for applying geometry flip.

Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:23:45 +0000 (13:23 -0700)]

am b25f7950: am be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit 'b25f7950b9fe54a1c42b00662b79639ce1844108':
Adding Crop, Rotate, Flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:22:25 +0000 (13:22 -0700)]

am be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit 'be4d0574388a91f5bf0e70c2a8383ec08ff39cc7':
Adding Crop, Rotate, Flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:20:06 +0000 (13:20 -0700)]

am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit '3f496bb02f11067b4b66d9a1dce74262dcb80c3f':
Adding Crop, Rotate, Flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:18:34 +0000 (13:18 -0700)]

am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit '8e7b50948261570ec1d75ba451236b971dc5dc0f':
Adding Crop, Rotate, Flip.

commit | commitdiff | tree

Ruben Brunk [Mon, 8 Oct 2012 20:17:18 +0000 (13:17 -0700)]

Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 20:01:32 +0000 (13:01 -0700)]

am 5141d44f: (-s ours) am 7d134308: am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5141d44f03d2e00e40f02853643d56cd70581186':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 20:01:31 +0000 (13:01 -0700)]

am 877fb1b4: (-s ours) am 785bfd56: am cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE

* commit '877fb1b41a4f541e29a09b80c5e00ed71183ea19':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:59:34 +0000 (12:59 -0700)]

am 7d134308: am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '7d1343088c1b8f924b3df9f6a2c0d779274367d1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:59:33 +0000 (12:59 -0700)]

am 785bfd56: am cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE

* commit '785bfd5617f4b47e0c1830bef081985e6a4f402a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:58:56 +0000 (12:58 -0700)]

am 6fcdffea: (-s ours) am 3ee2aec5: Import translations. DO NOT MERGE

* commit '6fcdffea5e2e7e76a80a988faaf838040f43f2ba':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:57:34 +0000 (12:57 -0700)]

am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9e733e81a279d5dfdeddad91879b2fff0fa514f4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:57:34 +0000 (12:57 -0700)]

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

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

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:56:56 +0000 (12:56 -0700)]

am 3ee2aec5: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:55:28 +0000 (12:55 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 19:55:03 +0000 (12:55 -0700)]

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

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

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Sep 2012 19:38:08 +0000 (12:38 -0700)]

Adding Crop, Rotate, Flip.

Bug: 7224232
Bug: 7218935

Adding geometry manipulation UI features.

Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 18:18:03 +0000 (11:18 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia89d0ceab8100f459e10f443350da7fb9610030e
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 18:17:37 +0000 (11:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: I68176186a2943b1ac6e6a66ef3a69d381904774c
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 18:17:08 +0000 (11:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib10195e4950980b7f97664a2950aad60b35da7c1
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 8 Oct 2012 18:16:15 +0000 (11:16 -0700)]

Import translations. DO NOT MERGE

Change-Id: I5f9734095da2a7369cfbd5eb49526d8a0a925466
Auto-generated-cl: translation import

commit | commitdiff | tree

Mangesh Ghiware [Mon, 8 Oct 2012 08:10:01 +0000 (01:10 -0700)]

am c94894dd: am 856b49ac: am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type

* commit 'c94894dd7fd17022537c7a9ff84b37e3d27de2d8':
Share only 360-degree panoramas with new MIME type

commit | commitdiff | tree

Mangesh Ghiware [Mon, 8 Oct 2012 08:08:21 +0000 (01:08 -0700)]

am 856b49ac: am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type

* commit '856b49ac5c1af7bd025905e275599deff0c55bab':
Share only 360-degree panoramas with new MIME type

commit | commitdiff | tree

Mangesh Ghiware [Mon, 8 Oct 2012 08:07:22 +0000 (01:07 -0700)]

am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type

* commit 'e0ad4914d533f9dab3b0e0f21808a3c6dd4aa5d4':
Share only 360-degree panoramas with new MIME type

commit | commitdiff | tree

Mangesh Ghiware [Mon, 8 Oct 2012 08:05:35 +0000 (01:05 -0700)]

am 51ebe5f7: Share only 360-degree panoramas with new MIME type

* commit '51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018':
Share only 360-degree panoramas with new MIME type

commit | commitdiff | tree

Mangesh Ghiware [Mon, 8 Oct 2012 06:55:43 +0000 (23:55 -0700)]

Share only 360-degree panoramas with new MIME type

Bug: 7302972

Instead of using the UsePanoramaViewer attribute in XMP metadata,
ensure that the panorama is full 360 degree by checking if the
cropped width is same as the full panorama width.

Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:43:44 +0000 (23:43 -0700)]

am 7d20f9c3: am a2a8ca9a: am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll

* commit '7d20f9c3ad4c498e6046f4c1d80be11a76f190d8':
Launch correct photo when tapping grid item in Camera roll

commit | commitdiff | tree

Owen Lin [Mon, 8 Oct 2012 06:43:41 +0000 (23:43 -0700)]

am ee8d3328: am 859af62c: am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

* commit 'ee8d332866be560fa8ff828e133c7b8d636ce55d':
Fix ANR in creating the fallback animation.

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:43:40 +0000 (23:43 -0700)]

am c2179578: am 8bfae8fa: am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items

* commit 'c217957843d94045c59ee79a4f83aa1c337b19de':
No Camera recenter on resume after editing or viewing items

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:43:39 +0000 (23:43 -0700)]

am a3019b73: am 28e83581: am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

* commit 'a3019b7396eaba3def09cedfc5689e61a8591c0a':
Show progress indicator dialog when saving edited image

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:40:27 +0000 (23:40 -0700)]

am a2a8ca9a: am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll

* commit 'a2a8ca9a42017bb600b711007d3698673901c857':
Launch correct photo when tapping grid item in Camera roll

commit | commitdiff | tree

Owen Lin [Mon, 8 Oct 2012 06:40:26 +0000 (23:40 -0700)]

am 859af62c: am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

* commit '859af62c8e1cc8367b9edc14292bc2d557cca6ad':
Fix ANR in creating the fallback animation.

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:40:25 +0000 (23:40 -0700)]

am 8bfae8fa: am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items

* commit '8bfae8fa30a34f862a45eebc57253adf60352b70':
No Camera recenter on resume after editing or viewing items

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:40:24 +0000 (23:40 -0700)]

am 28e83581: am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

* commit '28e835818c8d503998b67ab605d1fec6ef4c9fcf':
Show progress indicator dialog when saving edited image

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:36:34 +0000 (23:36 -0700)]

am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll

* commit 'a255a55433a01ec0c713d970f2ca88ee951014c0':
Launch correct photo when tapping grid item in Camera roll

commit | commitdiff | tree

Owen Lin [Mon, 8 Oct 2012 06:36:33 +0000 (23:36 -0700)]

am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

* commit '1414391d9143ef8ea9e88b8b0efa5cd467f50251':
Fix ANR in creating the fallback animation.

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:36:32 +0000 (23:36 -0700)]

am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items

* commit '96cc89604c8129ef5cea23639f0e3f81f69e8040':
No Camera recenter on resume after editing or viewing items

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:36:31 +0000 (23:36 -0700)]

am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

* commit '60309301ba9c6e59d49babb96f048034ad610e53':
Show progress indicator dialog when saving edited image

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:20:53 +0000 (23:20 -0700)]

am 76f18810: Launch correct photo when tapping grid item in Camera roll

* commit '76f1881067d7ca4eda6d3e398567473d2913c5d1':
Launch correct photo when tapping grid item in Camera roll

commit | commitdiff | tree

Owen Lin [Mon, 8 Oct 2012 06:20:51 +0000 (23:20 -0700)]

am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

* commit 'ed8c88102153dd7dca8458d7f0a9b81937c58023':
Fix ANR in creating the fallback animation.

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:20:50 +0000 (23:20 -0700)]

am d81b2649: No Camera recenter on resume after editing or viewing items

* commit 'd81b264931cfa3b34096efd46659b81f9a628fb5':
No Camera recenter on resume after editing or viewing items

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:20:49 +0000 (23:20 -0700)]

am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

* commit '4b39551d67b9868c289fd2c31f62d3326fc6f697':
Show progress indicator dialog when saving edited image

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Oct 2012 06:06:05 +0000 (23:06 -0700)]

Launch correct photo when tapping grid item in Camera roll

Bug: 7303049
Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd

commit | commitdiff | tree

Owen Lin [Mon, 8 Oct 2012 03:14:46 +0000 (20:14 -0700)]

Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 23:25:54 +0000 (16:25 -0700)]

No Camera recenter on resume after editing or viewing items

Bug: 7302361
Change-Id: I7420f89a766dc86d873166789b1875539541825c

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 23:35:01 +0000 (16:35 -0700)]

Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 22:20:44 +0000 (15:20 -0700)]

Show progress indicator dialog when saving edited image

Bug: 7301277
Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 21:17:54 +0000 (14:17 -0700)]

am ff5462f3: am 2b27c5ef: am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

* commit 'ff5462f3ec2e35875176aa0a0356750703563439':
Show stitched panorama in secure album.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 21:15:00 +0000 (14:15 -0700)]

am 2b27c5ef: am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

* commit '2b27c5ef83e2d4350133ea1ee0fed1094c9f0c4c':
Show stitched panorama in secure album.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 21:13:08 +0000 (14:13 -0700)]

am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

* commit '28fa6384f41d182dde403bc5c156cb23b248898f':
Show stitched panorama in secure album.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 21:11:27 +0000 (14:11 -0700)]

am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

* commit 'f5017c407c969da88017a697aae7462b552e65ee':
Show stitched panorama in secure album.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 21:09:56 +0000 (14:09 -0700)]

Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:58:44 +0000 (13:58 -0700)]

am 46c744b0: am 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera

* commit '46c744b033119d933f72cb2fc3a234f53bd00520':
Fix orientation locking issues when going back to Camera

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:56:20 +0000 (13:56 -0700)]

am 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera

* commit '0d7f0850954f6878c98ef44bff4642252a3bb60f':
Fix orientation locking issues when going back to Camera

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:54:20 +0000 (13:54 -0700)]

am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera

* commit 'd7b3cb87ddd85bd6e361b0dabe0dd02d0bb53f7a':
Fix orientation locking issues when going back to Camera

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:53:02 +0000 (13:53 -0700)]

am bbc99316: Fix orientation locking issues when going back to Camera

* commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8':
Fix orientation locking issues when going back to Camera

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:34:57 +0000 (13:34 -0700)]

Fix orientation locking issues when going back to Camera

Bug: 7287039
Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:03:05 +0000 (13:03 -0700)]

am 7c33965b: am 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '7c33965bb0b8e198e7ba9df3c9993d13ce1b68f9':
Change display of 360 panorama button

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:03:04 +0000 (13:03 -0700)]

am 83103326: am 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery

* commit '831033260f7624799d0435f1e8ef1437d0bd5b56':
Implement new grid layout in Gallery

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:03:03 +0000 (13:03 -0700)]

am f976cc3e: am b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip

* commit 'f976cc3e4ba429970d0e27f009861c71c8045405':
Tune swipe to delete in filmstrip

commit | commitdiff | tree

John Reck [Sun, 7 Oct 2012 20:03:02 +0000 (13:03 -0700)]

am d39af7d0: am 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit 'd39af7d04be5b9bc22bcd00ff9019e65d398e996':
Animation support

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 20:03:01 +0000 (13:03 -0700)]

am 5e9ddc51: am 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '5e9ddc51007da757331346af1996bee4416c8216':
Fix display of spinner and SQL exception for view intent

commit | commitdiff | tree

Wu-cheng Li [Sun, 7 Oct 2012 20:03:00 +0000 (13:03 -0700)]

am 0f692104: am 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit '0f692104dedaa297d7074b2c946c498bc04accee':
Change LOCAL_SDK_VERSION to current.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 20:02:59 +0000 (13:02 -0700)]

am 33b8f0ed: am ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '33b8f0ed1377515c64ca7ac82513b2fd1803e6e7':
Move LightCycle undo to settings area.

commit | commitdiff | tree

Bart Sears [Sun, 7 Oct 2012 20:02:58 +0000 (13:02 -0700)]

am cc089940: am d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'cc08994062ab6f5db841031ffba4c92b60d48e85':
Revert "Upload screennails in tiles to prevent jank"

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 19:59:23 +0000 (12:59 -0700)]

am 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '80a387c708704e9ffd15d33c860a46e0658211dd':
Change display of 360 panorama button

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 19:59:22 +0000 (12:59 -0700)]

am 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery

* commit '7261d8b1ecbfb83d22a13867bee8a2efc380ea39':
Implement new grid layout in Gallery

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 19:59:21 +0000 (12:59 -0700)]

am b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip

* commit 'b521475b9d3a8c78f698b1444bce2dfb9068ec5f':
Tune swipe to delete in filmstrip

commit | commitdiff | tree

John Reck [Sun, 7 Oct 2012 19:59:20 +0000 (12:59 -0700)]

am 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '948a613eeed911c4e7f5f83aec86935cb9ec526d':
Animation support

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 19:59:20 +0000 (12:59 -0700)]

am 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '963ee8d209cd60a07614d1a7600e4a86791f3286':
Fix display of spinner and SQL exception for view intent

commit | commitdiff | tree

Wu-cheng Li [Sun, 7 Oct 2012 19:59:19 +0000 (12:59 -0700)]

am 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit '46471161f751285e6f4725ec087387bbfe7a441b':
Change LOCAL_SDK_VERSION to current.

commit | commitdiff | tree

George Mount [Sun, 7 Oct 2012 19:59:18 +0000 (12:59 -0700)]

am ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit 'ffe1a290c8788cfedfcea2e193c2a4a79ad71d9c':
Move LightCycle undo to settings area.

commit | commitdiff | tree

Bart Sears [Sun, 7 Oct 2012 19:59:17 +0000 (12:59 -0700)]

am d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'd289df8ef649de216f9a39ca7a0fca21cf78ae63':
Revert "Upload screennails in tiles to prevent jank"

commit | commitdiff | tree

Bobby Georgescu [Sun, 7 Oct 2012 19:56:29 +0000 (12:56 -0700)]

am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '9333917b0c31c4bdfd76593849f55d9e1e1988e9':
Change display of 360 panorama button