OSDN Git Service
Bobby Georgescu [Wed, 10 Oct 2012 21:08:34 +0000 (14:08 -0700)]
am
2647b8db: am
176126dc: am
45d7d0a2: am
ce81f255: Set width of filmstrip/grid spinner to wrap content
* commit '
2647b8db1e35f4c75743754905054358c7418b56':
Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 21:06:32 +0000 (14:06 -0700)]
am
176126dc: am
45d7d0a2: am
ce81f255: Set width of filmstrip/grid spinner to wrap content
* commit '
176126dcce34ba356aa2b5cbc6935058e15f3c62':
Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 21:04:53 +0000 (14:04 -0700)]
am
45d7d0a2: am
ce81f255: Set width of filmstrip/grid spinner to wrap content
* commit '
45d7d0a2de490378e8c913c69fe5973ac2805b62':
Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 21:02:59 +0000 (14:02 -0700)]
am
ce81f255: Set width of filmstrip/grid spinner to wrap content
* commit '
ce81f2553dbcacc46c1540bf2a01da8557ba0b40':
Set width of filmstrip/grid spinner to wrap content
Bobby Georgescu [Wed, 10 Oct 2012 18:12:14 +0000 (11:12 -0700)]
Set width of filmstrip/grid spinner to wrap content
Bug:
7322464
Change-Id: I273370a212a2b63e195cae11b48b96191672e996
George Mount [Wed, 10 Oct 2012 17:47:00 +0000 (10:47 -0700)]
am
d0474e08: am
779cfe9d: am
fcdc86ed: am
21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* commit '
d0474e08c89a30e809cad568c86897065769bd40':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 17:45:54 +0000 (10:45 -0700)]
am
779cfe9d: am
fcdc86ed: am
21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* commit '
779cfe9dcd55871b21f48cbf96bdeaf2e4187e2b':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 17:44:39 +0000 (10:44 -0700)]
am
fcdc86ed: am
21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* commit '
fcdc86edd4fdadeec5d4bac1f64c432ad000663a':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 17:42:58 +0000 (10:42 -0700)]
am
21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* commit '
21832eb7fba76cd101ad5ef7b131292aa24f3864':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 17:41:16 +0000 (10:41 -0700)]
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* changes:
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
George Mount [Wed, 10 Oct 2012 04:02:42 +0000 (21:02 -0700)]
Change how stitched images are inserted into Gallery.
Bug
7299396
Stitching images now use normal LocalImages for their MediaItem
instead of LightCycleItems. They are no longer part of a special
album.
Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
George Mount [Wed, 10 Oct 2012 00:50:33 +0000 (17:50 -0700)]
Move panorama stitch progress outside the image.
Bug
7302513
Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
John Reck [Wed, 10 Oct 2012 17:04:45 +0000 (10:04 -0700)]
am
c6cd898b: am
f59f52e9: am
194b77c1: am
eece6da4: Support REVERSE in lockOrientation
* commit '
c6cd898b7c63b434d9d3641a688ba1f0294a373b':
Support REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 17:02:13 +0000 (10:02 -0700)]
am
f59f52e9: am
194b77c1: am
eece6da4: Support REVERSE in lockOrientation
* commit '
f59f52e93882d1268e6b056603bf7fe983681c85':
Support REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 17:00:44 +0000 (10:00 -0700)]
am
194b77c1: am
eece6da4: Support REVERSE in lockOrientation
* commit '
194b77c1b09c65ff52ed24fafe3af6e4d33519a8':
Support REVERSE in lockOrientation
John Reck [Wed, 10 Oct 2012 16:58:10 +0000 (09:58 -0700)]
am
eece6da4: Support REVERSE in lockOrientation
* commit '
eece6da4d344f7e1e937130c0d36cef8ef9dbe0c':
Support REVERSE in lockOrientation
The Android Open Source Project [Wed, 10 Oct 2012 16:51:08 +0000 (09:51 -0700)]
am
e87061a6: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
e87061a646aafcf498a56b1669a2243f074d6919':
Fix share crash after closing photo editor
The Android Open Source Project [Wed, 10 Oct 2012 16:45:30 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I265c658777e6c18ecd86cd57e00d6102dbec034a
John Reck [Wed, 10 Oct 2012 16:44:48 +0000 (09:44 -0700)]
Support REVERSE in lockOrientation
Bug:
7314703
Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
The Android Automerger [Wed, 10 Oct 2012 15:57:28 +0000 (08:57 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
John Reck [Wed, 10 Oct 2012 15:39:53 +0000 (08:39 -0700)]
am
34dc4359: am
b5e6418e: am
ca41df84: am
866ed7ab: Fix inverted panorama preview
* commit '
34dc4359d486557d2795b53967d1b98389a8fe9f':
Fix inverted panorama preview
John Reck [Wed, 10 Oct 2012 15:37:27 +0000 (08:37 -0700)]
am
b5e6418e: am
ca41df84: am
866ed7ab: Fix inverted panorama preview
* commit '
b5e6418e7c577c01efb4e3b35726d4962211a86e':
Fix inverted panorama preview
John Reck [Wed, 10 Oct 2012 15:34:09 +0000 (08:34 -0700)]
am
ca41df84: am
866ed7ab: Fix inverted panorama preview
* commit '
ca41df84f8cc8f63d7856c904ceef67adb0b5207':
Fix inverted panorama preview
John Reck [Wed, 10 Oct 2012 15:30:27 +0000 (08:30 -0700)]
am
866ed7ab: Fix inverted panorama preview
* commit '
866ed7abd7960efc7986a3624414a730e17f33a6':
Fix inverted panorama preview
The Android Automerger [Wed, 10 Oct 2012 13:59:43 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
John Reck [Wed, 10 Oct 2012 05:10:13 +0000 (22:10 -0700)]
Fix inverted panorama preview
Bug:
7314703
Panorama only support rotations of 0 and 90, so if it is greater
than that flip the output surface texture
Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
John Hoford [Wed, 10 Oct 2012 01:17:09 +0000 (18:17 -0700)]
am
7af3a27d: am
1d1ba1a5: am
efce987c: am
1b72a2f1: small fix to red eye code
* commit '
7af3a27d96bba73cd8def0158ada7e3a251fb96e':
small fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:15:55 +0000 (18:15 -0700)]
am
1d1ba1a5: am
efce987c: am
1b72a2f1: small fix to red eye code
* commit '
1d1ba1a56e040d58175e1490f3bb026b192e8008':
small fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:15:01 +0000 (18:15 -0700)]
am
efce987c: am
1b72a2f1: small fix to red eye code
* commit '
efce987c5da9f8a33a1e03508853b900879f5338':
small fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:13:43 +0000 (18:13 -0700)]
am
1b72a2f1: small fix to red eye code
* commit '
1b72a2f1124610b8050dbbdff9f1bb548199fd2e':
small fix to red eye code
John Hoford [Wed, 10 Oct 2012 01:05:51 +0000 (18:05 -0700)]
small fix to red eye code
bug:
7234321
Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
nicolasroard [Wed, 10 Oct 2012 00:54:58 +0000 (17:54 -0700)]
nicolasroard [Wed, 10 Oct 2012 00:52:51 +0000 (17:52 -0700)]
nicolasroard [Wed, 10 Oct 2012 00:50:47 +0000 (17:50 -0700)]
nicolasroard [Wed, 10 Oct 2012 00:48:17 +0000 (17:48 -0700)]
nicolasroard [Tue, 9 Oct 2012 23:34:58 +0000 (16:34 -0700)]
Latest UI
bug:
7233983
bug:
7233980
Also fixes border scaling issues.
Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
John Hoford [Wed, 10 Oct 2012 00:35:19 +0000 (17:35 -0700)]
John Hoford [Wed, 10 Oct 2012 00:33:40 +0000 (17:33 -0700)]
John Hoford [Wed, 10 Oct 2012 00:31:20 +0000 (17:31 -0700)]
John Hoford [Wed, 10 Oct 2012 00:29:03 +0000 (17:29 -0700)]
Bobby Georgescu [Wed, 10 Oct 2012 00:19:36 +0000 (17:19 -0700)]
am
01008978: am
44cfd731: am
41fda3d3: am
d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
* commit '
010089788fc8c56aa3ff0abdb778cbaca41a98b2':
Correct stale background on completely empty gallery
Bobby Georgescu [Wed, 10 Oct 2012 00:19:36 +0000 (17:19 -0700)]
am
62b7945d: am
17f943ce: am
08e51088: am
501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
* commit '
62b7945df3b9a73281913e27313d9d9e4f0890fe':
Update design for grid/filmstrip switcher
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:16:56 +0000 (17:16 -0700)]
am
44cfd731: am
41fda3d3: am
d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
* commit '
44cfd7311111cda6d440ac251d284b4550ae577c':
Correct stale background on completely empty gallery
Bobby Georgescu [Wed, 10 Oct 2012 00:16:55 +0000 (17:16 -0700)]
am
17f943ce: am
08e51088: am
501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
* commit '
17f943ce220ce933514e5ed69d3e733cb74b30d1':
Update design for grid/filmstrip switcher
Bobby Georgescu [Wed, 10 Oct 2012 00:15:36 +0000 (17:15 -0700)]
am
3965d154: am
037c1a7f: am
07f340a9: am
3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
* commit '
3965d154253ece253ad0cd8a814ac606b338ea6b':
Fix lack of snapback on very short scroll
Bobby Georgescu [Wed, 10 Oct 2012 00:14:51 +0000 (17:14 -0700)]
am
41fda3d3: am
d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
* commit '
41fda3d39b60be35760a27619e0c755f5025ccb9':
Correct stale background on completely empty gallery
Bobby Georgescu [Wed, 10 Oct 2012 00:14:51 +0000 (17:14 -0700)]
am
08e51088: am
501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
* commit '
08e510887119516ac8031fe276df7e0f8e223a8c':
Update design for grid/filmstrip switcher
Bobby Georgescu [Wed, 10 Oct 2012 00:14:03 +0000 (17:14 -0700)]
am
037c1a7f: am
07f340a9: am
3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
* commit '
037c1a7faba9695f98a6754552b599517f7dbb4a':
Fix lack of snapback on very short scroll
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:12:17 +0000 (17:12 -0700)]
am
07f340a9: am
3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
* commit '
07f340a9a1b0a63aaf73bb1eb1fdf284d5847dcb':
Fix lack of snapback on very short scroll
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 18:02:38 +0000 (11:02 -0700)]
Fix share crash after closing photo editor
Bug:
7306707
Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
The Android Automerger [Tue, 9 Oct 2012 23:07:24 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Tue, 9 Oct 2012 22:39:14 +0000 (15:39 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:54:40 +0000 (13:54 -0700)]
am
da823a72: am
1db811c5: am
bc56bd0b: am
bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
* commit '
da823a72f9b41aad9e268cdd69d412091ae7babb':
Implementing Geometry save operations.
Ruben Brunk [Tue, 9 Oct 2012 20:53:18 +0000 (13:53 -0700)]
am
1db811c5: am
bc56bd0b: am
bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
* commit '
1db811c5a009e32e5bbc9e1a8aed62887b0e5de8':
Implementing Geometry save operations.
Ruben Brunk [Tue, 9 Oct 2012 20:52:08 +0000 (13:52 -0700)]
am
bc56bd0b: am
bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
* commit '
bc56bd0b83e52ed9ca3b17d5b41d4b03e33a17f8':
Implementing Geometry save operations.
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:28:57 +0000 (13:28 -0700)]
am
a4991efc: am
d13d1e21: am
1f6a2d89: am
d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
* commit '
a4991efce593c0a07669c0f5cc3ef9ff0cce9f6f':
Dejank camera roll scrolling in grid view.
Bobby Georgescu [Tue, 9 Oct 2012 20:27:02 +0000 (13:27 -0700)]
am
d13d1e21: am
1f6a2d89: am
d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
* commit '
d13d1e21642068417ea386c0cf328fc12fc93b82':
Dejank camera roll scrolling in grid view.
Bobby Georgescu [Tue, 9 Oct 2012 20:25:08 +0000 (13:25 -0700)]
am
1f6a2d89: am
d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
* commit '
1f6a2d898092d87734e41080b55fecf84d12ec0a':
Dejank camera roll scrolling in grid view.
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:53:05 +0000 (11:53 -0700)]
am
1de03b3f: am
34e934ce: am
a90d5d2d: am
6e733b74: Fix share crash after closing photo editor
* commit '
1de03b3f81527a99b3e7a4db1e37395e12cec2ba':
Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:50:37 +0000 (11:50 -0700)]
am
34e934ce: am
a90d5d2d: am
6e733b74: Fix share crash after closing photo editor
* commit '
34e934ce82867339e3c82bde713c9cd531291128':
Fix share crash after closing photo editor
Bobby Georgescu [Tue, 9 Oct 2012 18:49:07 +0000 (11:49 -0700)]
am
a90d5d2d: am
6e733b74: Fix share crash after closing photo editor
* commit '
a90d5d2d3d50ff07406c3e60bab23de1df288891':
Fix share crash after closing photo editor
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:54:04 +0000 (08:54 -0700)]
am
d7fc8875: am
6f1f877c: am
e5c57987: am
ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
* commit '
d7fc887508adafa6e9f8e0ba6856573bf0ecb4be':
Add procedural borders
Wu-cheng Li [Tue, 9 Oct 2012 15:54:00 +0000 (08:54 -0700)]
am
de1ad20c: am
93f4df7b: am
59aefb08: am
5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
* commit '
de1ad20ca075b4d40202358c1c730df5ed72a6cf':
Change versionCode to 40001 and versionName to 1.1.40001.
Wu-cheng Li [Tue, 9 Oct 2012 15:53:58 +0000 (08:53 -0700)]
am
3510f0c8: am
bb4490d1: am
6ddbf0db: am
2c83c5f0: Handle stitching progress in secure album.
* commit '
3510f0c8076782ce3ac92450634808b446d7d936':
Handle stitching progress in secure album.
Mangesh Ghiware [Tue, 9 Oct 2012 15:53:56 +0000 (08:53 -0700)]
am
d0b76349: am
69c5efcf: am
fcc92a7e: am
71ce96fc: Fix sharing as photo option for 360 degree panorama
* commit '
d0b763496418c3ba0fb4e68d2d5a87f6eca95f93':
Fix sharing as photo option for 360 degree panorama
nicolasroard [Tue, 9 Oct 2012 15:50:55 +0000 (08:50 -0700)]
am
6f1f877c: am
e5c57987: am
ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
* commit '
6f1f877c43e199fcf3f59534ad478a69dbe8c978':
Add procedural borders
nicolasroard [Tue, 9 Oct 2012 15:48:58 +0000 (08:48 -0700)]
am
e5c57987: am
ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
* commit '
e5c579872b254489f85b396055607ecbc4a5a664':
Add procedural borders
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:05:17 +0000 (08:05 -0700)]
am
93f4df7b: am
59aefb08: am
5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
* commit '
93f4df7bb9ad61c344be5702d7126bc2254e4cf3':
Change versionCode to 40001 and versionName to 1.1.40001.
Wu-cheng Li [Tue, 9 Oct 2012 15:02:12 +0000 (08:02 -0700)]
am
59aefb08: am
5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
* commit '
59aefb08fbd6d4b95409f25190c6004664eceb15':
Change versionCode to 40001 and versionName to 1.1.40001.
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:59:16 +0000 (07:59 -0700)]
am
bb4490d1: am
6ddbf0db: am
2c83c5f0: Handle stitching progress in secure album.
* commit '
bb4490d16f25de31e22b5e923fc2e77fdc3bcc60':
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.
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.
Mangesh Ghiware [Tue, 9 Oct 2012 14:53:20 +0000 (07:53 -0700)]
am
69c5efcf: am
fcc92a7e: am
71ce96fc: Fix sharing as photo option for 360 degree panorama
* commit '
69c5efcfe4db097d5f52afd8734c7647abaaaea7':
Fix sharing as photo option for 360 degree panorama
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: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
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
The Android Open Source Project [Tue, 9 Oct 2012 14:35:42 +0000 (07:35 -0700)]
am
09ec53ed: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
09ec53ed4ac50d88c923c1f9ea1ea01c3daa0c32':
Set the thumbnail/screennail sizes based on screensize
New UI...
The Android Open Source Project [Tue, 9 Oct 2012 14:30:21 +0000 (07:30 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I75b38f828159385c8a29c20a2050433bce8049ca