OSDN Git Service
John Hoford [Wed, 10 Oct 2012 00:29:03 +0000 (17:29 -0700)]
John Hoford [Tue, 9 Oct 2012 23:17:17 +0000 (16:17 -0700)]
add filters
bug:
7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
Bobby Georgescu [Wed, 10 Oct 2012 00:12:46 +0000 (17:12 -0700)]
am
d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
* commit '
d78c5734346cabc2577a5b9100f0f943c381ee47':
Correct stale background on completely empty gallery
Bobby Georgescu [Wed, 10 Oct 2012 00:12:45 +0000 (17:12 -0700)]
am
501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
* commit '
501bd1bff5189542612929b2428b7a69abc575a6':
Update design for grid/filmstrip switcher
Bobby Georgescu [Wed, 10 Oct 2012 00:11:38 +0000 (17:11 -0700)]
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:11:16 +0000 (17:11 -0700)]
Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 00:09:35 +0000 (17:09 -0700)]
am
3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
* commit '
3d81fdfd5916747b237229a2515152daf639447a':
Fix lack of snapback on very short scroll
Bobby Georgescu [Wed, 10 Oct 2012 00:08:27 +0000 (17:08 -0700)]
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 23:23:36 +0000 (16:23 -0700)]
Correct stale background on completely empty gallery
Bug:
7314560
When the last album is delete by long pressing and pressing
the delete icon, and the gallery is left completely empty,
the slotview was not being correctly invalidated.
Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
Bobby Georgescu [Tue, 9 Oct 2012 22:59:40 +0000 (15:59 -0700)]
Fix lack of snapback on very short scroll
Bug:
7318609
snapToNeighborImage returns false if it didn't
actually need to move to a neighboring image, so
use this information to correctly snapback if
needed.
Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
Bobby Georgescu [Tue, 9 Oct 2012 21:53:22 +0000 (14:53 -0700)]
Update design for grid/filmstrip switcher
Bug:
7317501
Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
Ruben Brunk [Tue, 9 Oct 2012 20:49:55 +0000 (13:49 -0700)]
am
bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
* commit '
bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0':
Implementing Geometry save operations.
Ruben Brunk [Tue, 9 Oct 2012 20:48:10 +0000 (13:48 -0700)]
Merge "Implementing Geometry save operations." into gb-ub-photos-arches
Bobby Georgescu [Tue, 9 Oct 2012 20:23:28 +0000 (13:23 -0700)]
am
d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
* commit '
d490f1aa851db853b9865a380abd01c67605d58b':
Dejank camera roll scrolling in grid view.
Bobby Georgescu [Tue, 9 Oct 2012 20:21:34 +0000 (13:21 -0700)]
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
Ruben Brunk [Tue, 9 Oct 2012 04:15:16 +0000 (21:15 -0700)]
Implementing Geometry save operations.
Bug:
7224232
Bug:
7218935
Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
Bobby Georgescu [Tue, 9 Oct 2012 18:47:13 +0000 (11:47 -0700)]
am
6e733b74: Fix share crash after closing photo editor
* commit '
6e733b74465ad6994c23d624fd8ee9b7c249e7b3':
Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:02:38 +0000 (11:02 -0700)]
Fix share crash after closing photo editor
Bug:
7306707
Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
nicolasroard [Tue, 9 Oct 2012 15:47:09 +0000 (08:47 -0700)]
am
ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
* commit '
ee7c1e011ddf4c54d5eb6104796e113d17d29e72':
Add procedural borders
nicolasroard [Tue, 9 Oct 2012 15:44:59 +0000 (08:44 -0700)]
Merge "Add procedural borders" into gb-ub-photos-arches
Wu-cheng Li [Tue, 9 Oct 2012 15:00:46 +0000 (08:00 -0700)]
am
5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
* commit '
5635aa9f99c4f364019b37298cc09f0e696a4c1b':
Change versionCode to 40001 and versionName to 1.1.40001.
Wu-cheng Li [Tue, 9 Oct 2012 14:59:39 +0000 (07:59 -0700)]
Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
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.
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
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
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
Pin Ting [Tue, 9 Oct 2012 09:43:46 +0000 (17:43 +0800)]
Dejank camera roll scrolling in grid view.
Bug:
7302644
Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
Wu-cheng Li [Tue, 9 Oct 2012 11:46:53 +0000 (19:46 +0800)]
Change versionCode to 40001 and versionName to 1.1.40001.
bug:
7310127
Change-Id: Id2648c3eab0b6e3a64c6013530551af40a1cdced
nicolasroard [Tue, 9 Oct 2012 04:04:48 +0000 (21:04 -0700)]
Add procedural borders
bug:
7233980
Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
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
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
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
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
Bobby Georgescu [Tue, 9 Oct 2012 02:26:54 +0000 (19:26 -0700)]
Start Camera album in grid mode
Bug:
7304603
Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
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.
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
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
nicolasroard [Tue, 9 Oct 2012 00:54:25 +0000 (17:54 -0700)]
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
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
Doris Liu [Mon, 8 Oct 2012 23:31:00 +0000 (16:31 -0700)]
Fix details dialog not being dismissed
Bug:
7300997
Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
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
John Reck [Mon, 8 Oct 2012 22:26:54 +0000 (15:26 -0700)]
am
a29eeac8: Use framework orientation
* commit '
a29eeac8993b221d98cffbec5583b5cba1921c89':
Use framework orientation
John Reck [Mon, 8 Oct 2012 21:52:07 +0000 (14:52 -0700)]
Use framework orientation
Bug:
7292373
Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
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
nicolasroard [Mon, 8 Oct 2012 22:21:59 +0000 (15:21 -0700)]
Merge "Fix the filtershow activity to portrait" 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
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
John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]
add redeye and improve shadow removal
bug:
7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
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
Bobby Georgescu [Mon, 8 Oct 2012 22:02:09 +0000 (15:02 -0700)]
am
639095c6: Correct undo behavior
* commit '
639095c6bed84ab0bf9ebc7c4f8b8c944df285a1':
Correct undo behavior
Bobby Georgescu [Mon, 8 Oct 2012 20:37:41 +0000 (13:37 -0700)]
Correct undo behavior
Bug:
7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
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.
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
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.
Ruben Brunk [Mon, 8 Oct 2012 20:17:18 +0000 (13:17 -0700)]
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Baligh Uddin [Mon, 8 Oct 2012 19:55:28 +0000 (12:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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
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
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
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
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
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
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
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.
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
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
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
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
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
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
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
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.
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
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
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
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
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
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
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
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
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
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.
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.
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"
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
Bobby Georgescu [Sun, 7 Oct 2012 02:12:20 +0000 (19:12 -0700)]
Implement new grid layout in Gallery
Bug:
7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31
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
Bobby Georgescu [Sun, 7 Oct 2012 00:39:23 +0000 (17:39 -0700)]
Tune swipe to delete in filmstrip
Bug:
7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d
John Reck [Sat, 6 Oct 2012 23:35:11 +0000 (16:35 -0700)]
Merge "Animation support" into gb-ub-photos-arches
John Reck [Sat, 6 Oct 2012 23:15:52 +0000 (16:15 -0700)]
Animation support
Bug:
7300696
Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d
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
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
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
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
Bart Sears [Sat, 6 Oct 2012 18:19:14 +0000 (11:19 -0700)]
Revert "Upload screennails in tiles to prevent jank"
This CL is reported to cause images to not be displayed correctly when opened via the view intent.
Bug:
7299123
This reverts commit
e29fc4a51b99f12f7fae13fae272858df2e1af36
Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d
Baligh Uddin [Sat, 6 Oct 2012 04:07:21 +0000 (21:07 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
George Mount [Fri, 5 Oct 2012 23:17:13 +0000 (16:17 -0700)]
Move LightCycle undo to settings area.
Bug
7294328
Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e
nicolasroard [Fri, 5 Oct 2012 23:22:00 +0000 (16:22 -0700)]
am
df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
* commit '
df479ddec29551216a9344e4bae925f60185210a':
Add scale factor / quality parameters in filters
nicolasroard [Fri, 5 Oct 2012 23:20:49 +0000 (16:20 -0700)]
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 23:13:49 +0000 (16:13 -0700)]
am
e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
e6b2212a98fcd175343d63d2772afe963dc6d64e':
Import translations. DO NOT MERGE