OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:57:38 +0000 (07:57 -0700)]
am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album.

* commit '6ddbf0db026fbf8b8d3e21a7fa1351764a095359':
  Handle stitching progress in secure album.

11 years agoam 2c83c5f0: Handle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 14:55:37 +0000 (07:55 -0700)]
am 2c83c5f0: Handle stitching progress in secure album.

* commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d':
  Handle stitching progress in secure album.

11 years agoHandle stitching progress in secure album.
Wu-cheng Li [Tue, 9 Oct 2012 06:44:31 +0000 (14:44 +0800)]
Handle stitching progress in secure album.

- In secure album, show stitching progress only if it is
  captured after the device is locked.
- Make sure image capture intent does not show stitching
  progress.

bug:7285105

Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb

11 years agoam fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 14:50:44 +0000 (07:50 -0700)]
am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit 'fcc92a7e74f0e10458dfada217c286ac08d0eec1':
  Fix sharing as photo option for 360 degree panorama

11 years agoam 71ce96fc: Fix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 14:49:16 +0000 (07:49 -0700)]
am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit '71ce96fc79787dedac56af75385dc227d52be3af':
  Fix sharing as photo option for 360 degree panorama

11 years agoFix sharing as photo option for 360 degree panorama
Mangesh Ghiware [Tue, 9 Oct 2012 06:55:38 +0000 (23:55 -0700)]
Fix sharing as photo option for 360 degree panorama

Bug: 7310190
Bug: 7302023

Also, fix disappearing sharing menu item in action bar.

Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07

11 years agoam e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos...
Bobby Georgescu [Tue, 9 Oct 2012 02:35:37 +0000 (19:35 -0700)]
am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit 'e28986dda9d58c834fd10b179f4e2b0131260f9d':
  Start Camera album in grid mode

11 years agoam a74f1f4c: am 895e13e8: Fix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:35:36 +0000 (19:35 -0700)]
am a74f1f4c: am 895e13e8: Fix crash when starting the editor

* commit 'a74f1f4c2228ad43de5385682656cf780d84d3dd':
  Fix crash when starting the editor

11 years agoam 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 02:34:13 +0000 (19:34 -0700)]
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit '3a1279f11ec88e62a75303469b886f1cb9d50c30':
  Start Camera album in grid mode

11 years agoam 895e13e8: Fix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:34:12 +0000 (19:34 -0700)]
am 895e13e8: Fix crash when starting the editor

* commit '895e13e85dcb156cdc4eff882e10c4497a56de1e':
  Fix crash when starting the editor

11 years agoMerge "Start Camera album in grid mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 02:32:55 +0000 (19:32 -0700)]
Merge "Start Camera album in grid mode" into gb-ub-photos-arches

11 years agoFix crash when starting the editor
nicolasroard [Tue, 9 Oct 2012 02:29:58 +0000 (19:29 -0700)]
Fix crash when starting the editor

Bug: 7224232

CL 236429 readded offending lines after the merge...

Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819

11 years agoStart Camera album in grid mode
Bobby Georgescu [Tue, 9 Oct 2012 02:26:54 +0000 (19:26 -0700)]
Start Camera album in grid mode

Bug: 7304603
Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388

11 years agoam cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:29:50 +0000 (18:29 -0700)]
am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit 'cf66c41401af64b2b3446602302cc94fff8fbfe4':
  Added the rest of the Geometryfilter stubs.

11 years agoam a66df0c9: Added the rest of the Geometryfilter stubs.
Ruben Brunk [Tue, 9 Oct 2012 01:27:58 +0000 (18:27 -0700)]
am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c':
  Added the rest of the Geometryfilter stubs.

11 years agoAdded the rest of the Geometryfilter stubs.
Ruben Brunk [Mon, 8 Oct 2012 23:05:48 +0000 (16:05 -0700)]
Added the rest of the Geometryfilter stubs.

Bug: 7224232
Bug: 7218935
Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8

11 years agoam 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata"...
nicolasroard [Tue, 9 Oct 2012 00:58:55 +0000 (17:58 -0700)]
am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit '8e5ccb2197b2322ecffa5c6b4195f7ac85d3119c':
  Fix crash introduced with the GeometryMetadata

11 years agoam f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos...
nicolasroard [Tue, 9 Oct 2012 00:56:39 +0000 (17:56 -0700)]
am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1':
  Fix crash introduced with the GeometryMetadata

11 years agoMerge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
nicolasroard [Tue, 9 Oct 2012 00:54:25 +0000 (17:54 -0700)]
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

11 years agoam fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:25:47 +0000 (17:25 -0700)]
am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed

* commit 'fe02f8c1dee70f766828444e820b5766fd16147e':
  Fix details dialog not being dismissed

11 years agoam 4438a7cc: Fix details dialog not being dismissed
Doris Liu [Tue, 9 Oct 2012 00:23:56 +0000 (17:23 -0700)]
am 4438a7cc: Fix details dialog not being dismissed

* commit '4438a7cce00cb19cb35cfc3cc149533f40043c00':
  Fix details dialog not being dismissed

11 years agoFix details dialog not being dismissed
Doris Liu [Mon, 8 Oct 2012 23:31:00 +0000 (16:31 -0700)]
Fix details dialog not being dismissed

Bug: 7300997
Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5

11 years agoFix crash introduced with the GeometryMetadata
nicolasroard [Mon, 8 Oct 2012 23:38:19 +0000 (16:38 -0700)]
Fix crash introduced with the GeometryMetadata

bug:7224232
bug:7279964
bug:7298708

- Also remove the slide gesture (only use the slider widget)
- use scaleFactor to apply sharpen proportionally

Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3

11 years agoam 73d3785c: am a29eeac8: Use framework orientation
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

11 years agoam a29eeac8: Use framework orientation
John Reck [Mon, 8 Oct 2012 22:26:54 +0000 (15:26 -0700)]
am a29eeac8: Use framework orientation

* commit 'a29eeac8993b221d98cffbec5583b5cba1921c89':
  Use framework orientation

11 years agoam 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb...
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

11 years agoUse framework orientation
John Reck [Mon, 8 Oct 2012 21:52:07 +0000 (14:52 -0700)]
Use framework orientation

 Bug: 7292373

Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2

11 years agoam 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
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

11 years agoam 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub...
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

11 years agoMerge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
nicolasroard [Mon, 8 Oct 2012 22:21:59 +0000 (15:21 -0700)]
Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches

11 years agoam 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
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

11 years agoMerge "add redeye and improve shadow removal" into gb-ub-photos-arches
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

11 years agoam 05ae0806: am 639095c6: Correct undo behavior
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

11 years agoadd redeye and improve shadow removal
John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]
add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681

11 years agoFix the filtershow activity to portrait
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

11 years agoam 639095c6: Correct undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 22:02:09 +0000 (15:02 -0700)]
am 639095c6: Correct undo behavior

* commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1':
  Correct undo behavior

11 years agoCorrect undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 20:37:41 +0000 (13:37 -0700)]
Correct undo behavior

Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b

11 years agoam 0efc1133: am 7bd60250: Added stub for applying geometry flip.
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.

11 years agoam 7bd60250: Added stub for applying geometry flip.
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.

11 years agoAdded stub for applying geometry flip.
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

11 years agoam 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
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.

11 years agoam 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
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.

11 years agoMerge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Ruben Brunk [Mon, 8 Oct 2012 20:17:18 +0000 (13:17 -0700)]
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

11 years agoam 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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

11 years agoam cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 19:55:28 +0000 (12:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam d199202e: (-s ours) Import translations. DO NOT MERGE
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

11 years agoAdding Crop, Rotate, Flip.
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoam e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type
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

11 years agoam 51ebe5f7: Share only 360-degree panoramas with new MIME type
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

11 years agoShare only 360-degree panoramas with new MIME type
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

11 years agoam a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll
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

11 years agoam 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into...
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.

11 years agoam 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items
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

11 years agoam 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited...
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

11 years agoam 76f18810: Launch correct photo when tapping grid item in Camera roll
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

11 years agoam ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos...
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.

11 years agoam d81b2649: No Camera recenter on resume after editing or viewing items
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

11 years agoam 4b39551d: Merge "Show progress indicator dialog when saving edited image" into...
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

11 years agoLaunch correct photo when tapping grid item in Camera roll
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

11 years agoMerge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
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

11 years agoNo Camera recenter on resume after editing or viewing items
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

11 years agoMerge "Show progress indicator dialog when saving edited image" into gb-ub-photos...
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

11 years agoShow progress indicator dialog when saving edited image
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

11 years agoam 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb...
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.

11 years agoam f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
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.

11 years agoMerge "Show stitched panorama in secure album." into gb-ub-photos-arches
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

11 years agoam d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera
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

11 years agoam bbc99316: Fix orientation locking issues when going back to Camera
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

11 years agoFix orientation locking issues when going back to Camera
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

11 years agoam 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub...
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

11 years agoam e55e0485: am 43ba9f66: Implement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 19:56:28 +0000 (12:56 -0700)]
am e55e0485: am 43ba9f66: Implement new grid layout in Gallery

* commit 'e55e04857bb2bfe46cedc0c9888c3a065e868efd':
  Implement new grid layout in Gallery

11 years agoam 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 19:56:27 +0000 (12:56 -0700)]
am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip

* commit '4cd1ceeebe17b6accc63e09400e737f38a8374f6':
  Tune swipe to delete in filmstrip

11 years agoam 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches
John Reck [Sun, 7 Oct 2012 19:56:26 +0000 (12:56 -0700)]
am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '04f97ab482b56cdf9fd23388838164dccc6c29c9':
  Animation support

11 years agoam 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view...
Bobby Georgescu [Sun, 7 Oct 2012 19:56:22 +0000 (12:56 -0700)]
am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '9fe7d852f12fece9350a1c1c653edd66d543e9df':
  Fix display of spinner and SQL exception for view intent

11 years agoam ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sun, 7 Oct 2012 19:56:21 +0000 (12:56 -0700)]
am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit 'ed1ab4c567b470158d54aae1d407de3b863f2c0f':
  Change LOCAL_SDK_VERSION to current.

11 years agoam 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb...
George Mount [Sun, 7 Oct 2012 19:56:20 +0000 (12:56 -0700)]
am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '75b984c012293889d14988681511a162ccff255e':
  Move LightCycle undo to settings area.

11 years agoam ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"
Bart Sears [Sun, 7 Oct 2012 19:56:20 +0000 (12:56 -0700)]
am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

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

11 years agoam 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:17:05 +0000 (12:17 -0700)]
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '4de36129b57e3a5308c109a407ea17b4fa103fe4':
  Change display of 360 panorama button

11 years agoMerge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:15:56 +0000 (12:15 -0700)]
Merge "Change display of 360 panorama button" into gb-ub-photos-arches

11 years agoam 43ba9f66: Implement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 19:11:39 +0000 (12:11 -0700)]
am 43ba9f66: Implement new grid layout in Gallery

* commit '43ba9f6644e4183b8ee27f96de3dda703d136c52':
  Implement new grid layout in Gallery

11 years agoam 3711d3ea: Tune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 19:11:30 +0000 (12:11 -0700)]
am 3711d3ea: Tune swipe to delete in filmstrip

* commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0':
  Tune swipe to delete in filmstrip

11 years agoam 278e4fe0: Merge "Animation support" into gb-ub-photos-arches
John Reck [Sun, 7 Oct 2012 19:11:30 +0000 (12:11 -0700)]
am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '278e4fe02f9754bc84a646988aa6ff31109b22e0':
  Animation support

11 years agoam 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into...
Bobby Georgescu [Sun, 7 Oct 2012 19:11:29 +0000 (12:11 -0700)]
am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5':
  Fix display of spinner and SQL exception for view intent

11 years agoam 9b672371: Change LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sun, 7 Oct 2012 19:11:28 +0000 (12:11 -0700)]
am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit '9b672371b88dddce1b56f31503ac01c730768d06':
  Change LOCAL_SDK_VERSION to current.

11 years agoam 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sun, 7 Oct 2012 19:11:27 +0000 (12:11 -0700)]
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '87b226cd6777431be09d3c1fcb01453e386256b2':
  Move LightCycle undo to settings area.

11 years agoam ad7cf187: Revert "Upload screennails in tiles to prevent jank"
Bart Sears [Sun, 7 Oct 2012 19:11:26 +0000 (12:11 -0700)]
am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

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

11 years agoShow stitched panorama in secure album.
Wu-cheng Li [Sun, 7 Oct 2012 13:43:12 +0000 (21:43 +0800)]
Show stitched panorama in secure album.

bug:7285105
Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a

11 years agoImplement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 02:12:20 +0000 (19:12 -0700)]
Implement new grid layout in Gallery

Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31

11 years agoChange display of 360 panorama button
Bobby Georgescu [Sat, 6 Oct 2012 22:22:03 +0000 (15:22 -0700)]
Change display of 360 panorama button

Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
 filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc

11 years agoTune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 00:39:23 +0000 (17:39 -0700)]
Tune swipe to delete in filmstrip

Bug: 7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d

11 years agoMerge "Animation support" into gb-ub-photos-arches
John Reck [Sat, 6 Oct 2012 23:35:11 +0000 (16:35 -0700)]
Merge "Animation support" into gb-ub-photos-arches

11 years agoAnimation support
John Reck [Sat, 6 Oct 2012 23:15:52 +0000 (16:15 -0700)]
Animation support

 Bug: 7300696

Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d

11 years agoMerge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos...
Bobby Georgescu [Sat, 6 Oct 2012 22:05:42 +0000 (15:05 -0700)]
Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

11 years agoChange LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sat, 6 Oct 2012 19:29:50 +0000 (03:29 +0800)]
Change LOCAL_SDK_VERSION to current.

bug:7208909

Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57

11 years agoMerge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sat, 6 Oct 2012 19:25:08 +0000 (12:25 -0700)]
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

11 years agoFix display of spinner and SQL exception for view intent
Bobby Georgescu [Sat, 6 Oct 2012 08:06:43 +0000 (01:06 -0700)]
Fix display of spinner and SQL exception for view intent

Bug: 7288544
Bug: 7219163
Remove the query for photo DISPLAY_NAME in view intent
since it is no longer used, and hide the spinner when
launching PhotoPage via this intent.

Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7