OSDN Git Service
Bobby Georgescu [Thu, 11 Oct 2012 00:23:30 +0000 (17:23 -0700)]
am
1e3c1518: am
d7e5b700: am
cceb7244: am
b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
* commit '
1e3c15180199e3b6caf0b0fa87bd231bf23c8904':
Change FilterShow theme and extra remove gray line
John Hoford [Thu, 11 Oct 2012 00:23:25 +0000 (17:23 -0700)]
am
ec9f3f89: am
91d8084a: am
810f8dff: am
53f24f0f: forced fx bitmaps to load unscaled
* commit '
ec9f3f891afadc9ae91f9f6de174ebc02011ac0a':
forced fx bitmaps to load unscaled
Bobby Georgescu [Thu, 11 Oct 2012 00:05:19 +0000 (17:05 -0700)]
am
d7e5b700: am
cceb7244: am
b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
* commit '
d7e5b700fa8904bb547ddb568ff97243c9a07c5e':
Change FilterShow theme and extra remove gray line
Bobby Georgescu [Thu, 11 Oct 2012 00:03:17 +0000 (17:03 -0700)]
am
cceb7244: am
b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
* commit '
cceb72446be42bb7546222f2871005d9f9b0042f':
Change FilterShow theme and extra remove gray line
Bobby Georgescu [Thu, 11 Oct 2012 00:02:03 +0000 (17:02 -0700)]
am
b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
* commit '
b4a3f4764a58d6d918d96399e1b05db887b9f9ad':
Change FilterShow theme and extra remove gray line
Bobby Georgescu [Thu, 11 Oct 2012 00:00:48 +0000 (17:00 -0700)]
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 23:45:36 +0000 (16:45 -0700)]
am
91d8084a: am
810f8dff: am
53f24f0f: forced fx bitmaps to load unscaled
* commit '
91d8084a67e341bc3a8a981e084574645ae3d34c':
forced fx bitmaps to load unscaled
John Hoford [Wed, 10 Oct 2012 23:43:35 +0000 (16:43 -0700)]
am
810f8dff: am
53f24f0f: forced fx bitmaps to load unscaled
* commit '
810f8dffd37b4225b4fc0ad09f2a4d55cb103f3e':
forced fx bitmaps to load unscaled
John Hoford [Wed, 10 Oct 2012 23:41:53 +0000 (16:41 -0700)]
am
53f24f0f: forced fx bitmaps to load unscaled
* commit '
53f24f0fbfd787a4ab2f129499d2c7ef240a517f':
forced fx bitmaps to load unscaled
Bobby Georgescu [Wed, 10 Oct 2012 22:57:17 +0000 (15:57 -0700)]
Change FilterShow theme and extra remove gray line
Bug:
7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
John Hoford [Wed, 10 Oct 2012 23:13:36 +0000 (16:13 -0700)]
forced fx bitmaps to load unscaled
bug:
7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
Bobby Georgescu [Wed, 10 Oct 2012 22:54:39 +0000 (15:54 -0700)]
am
9be3899f: am
84d62042: am
073e787f: am
f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
* commit '
9be3899f0e2e6321ab8cab1f5d1b407d8f81427e':
Change text size in spinner to avoid overlap
Bobby Georgescu [Wed, 10 Oct 2012 22:52:40 +0000 (15:52 -0700)]
am
84d62042: am
073e787f: am
f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
* commit '
84d62042e255a309eaa146a76206bce1c6ae9b7b':
Change text size in spinner to avoid overlap
John Hoford [Wed, 10 Oct 2012 22:52:14 +0000 (15:52 -0700)]
am
7568e968: am
bb23f14f: am
14b42fc1: am
f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
* commit '
7568e9688d50a3d39d41f5dc82701230728df476':
add White balance & disable UI elements
Bobby Georgescu [Wed, 10 Oct 2012 22:50:50 +0000 (15:50 -0700)]
am
073e787f: am
f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
* commit '
073e787f16ead7f0f9220b88cab6239cb37ca178':
Change text size in spinner to avoid overlap
John Hoford [Wed, 10 Oct 2012 22:50:11 +0000 (15:50 -0700)]
am
bb23f14f: am
14b42fc1: am
f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
* commit '
bb23f14f04ada88f6e233b3fac69f46780c6136f':
add White balance & disable UI elements
Bobby Georgescu [Wed, 10 Oct 2012 22:49:13 +0000 (15:49 -0700)]
am
f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
* commit '
f0bec555548429f59a798806fb5cb47f9dcc034c':
Change text size in spinner to avoid overlap
John Hoford [Wed, 10 Oct 2012 22:48:21 +0000 (15:48 -0700)]
am
14b42fc1: am
f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
* commit '
14b42fc1c0dcf6ffd629facfada872d2d30d5d44':
add White balance & disable UI elements
Bobby Georgescu [Wed, 10 Oct 2012 22:48:15 +0000 (15:48 -0700)]
Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 22:47:05 +0000 (15:47 -0700)]
am
f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
* commit '
f8044659db592f49e6e77c8a1d595955f9d206cb':
add White balance & disable UI elements
John Hoford [Wed, 10 Oct 2012 22:45:47 +0000 (15:45 -0700)]
Merge "add White balance & disable UI elements" into gb-ub-photos-arches
Bobby Georgescu [Wed, 10 Oct 2012 22:00:59 +0000 (15:00 -0700)]
Change text size in spinner to avoid overlap
Bug:
7321747
Change-Id: Ibc58bff8710f974813d4beb89e971bdfab6acfb7
Mangesh Ghiware [Wed, 10 Oct 2012 22:25:52 +0000 (15:25 -0700)]
am
d1ac7a72: am
d40057d8: am
0d77d6db: am
9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
* commit '
d1ac7a7213d757d02b41cdd61eea63c7c0048d78':
Disable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 22:24:00 +0000 (15:24 -0700)]
am
d40057d8: am
0d77d6db: am
9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
* commit '
d40057d892f85551a525c60d12b2cb116ef76b4e':
Disable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 22:21:57 +0000 (15:21 -0700)]
am
0d77d6db: am
9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
* commit '
0d77d6dbedb2887312bf96198086824c279b6465':
Disable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 22:19:47 +0000 (15:19 -0700)]
am
9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
* commit '
9b900e0d23a1a9c5b708424efe1a01b107bf774f':
Disable in-place crop for 360 panorama
Mangesh Ghiware [Wed, 10 Oct 2012 22:19:03 +0000 (15:19 -0700)]
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 21:17:30 +0000 (14:17 -0700)]
add White balance & disable UI elements
bug:
7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
Mangesh Ghiware [Wed, 10 Oct 2012 21:58:35 +0000 (14:58 -0700)]
Disable in-place crop for 360 panorama
Bug:
7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
Bobby Georgescu [Wed, 10 Oct 2012 21:11:40 +0000 (14:11 -0700)]
am
174b5aef: am
e5c95a93: am
977382f8: am
db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
* commit '
174b5aef75177f60d521986a8bc355b1f18717c4':
Fix missing camera thumbnail in filmstrip
Bobby Georgescu [Wed, 10 Oct 2012 21:10:30 +0000 (14:10 -0700)]
am
e5c95a93: am
977382f8: am
db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
* commit '
e5c95a93039728b69f3f471278290611b98f18e5':
Fix missing camera thumbnail in filmstrip
Bobby Georgescu [Wed, 10 Oct 2012 21:08:34 +0000 (14:08 -0700)]
am
977382f8: am
db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
* commit '
977382f8f1e9399b14f15f8e4d636dfda55b6db3':
Fix missing camera thumbnail in filmstrip
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:06:10 +0000 (14:06 -0700)]
am
db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
* commit '
db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b':
Fix missing camera thumbnail in filmstrip
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:04:06 +0000 (14:04 -0700)]
Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
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 20:42:55 +0000 (13:42 -0700)]
Fix missing camera thumbnail in filmstrip
Bug:
7319894
Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
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.