OSDN Git Service
Baligh Uddin [Thu, 11 Oct 2012 17:12:15 +0000 (10:12 -0700)]
am
e8124973: am
f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
e8124973c4e78652df05a21a1ce69e8624d45390':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Oct 2012 17:11:10 +0000 (10:11 -0700)]
am
f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
f3dd4ce8620390b8a041afbc045fc789b6e17ad1':
Import translations. DO NOT MERGE
John Reck [Thu, 11 Oct 2012 17:10:46 +0000 (10:10 -0700)]
am
075b593a: am
5cca8b99: Fix portrait orientation on landscape devices
* commit '
075b593a4fe8a0613cc1edf43ee93ba525ccdc41':
Fix portrait orientation on landscape devices
Baligh Uddin [Thu, 11 Oct 2012 17:10:19 +0000 (10:10 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
John Reck [Thu, 11 Oct 2012 17:08:55 +0000 (10:08 -0700)]
am
5cca8b99: Fix portrait orientation on landscape devices
* commit '
5cca8b99bebe6a9fbb191a8e1364b81e309a1390':
Fix portrait orientation on landscape devices
John Reck [Thu, 11 Oct 2012 16:40:18 +0000 (09:40 -0700)]
Fix portrait orientation on landscape devices
Bug:
7328349
Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
Ruben Brunk [Thu, 11 Oct 2012 07:40:16 +0000 (00:40 -0700)]
am
b6adfcf8: am
fb6edb42: Remove compare and reset from apply bar and fix text.
* commit '
b6adfcf8a485da464378bb8907698a08852a68ed':
Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 07:38:15 +0000 (00:38 -0700)]
am
fb6edb42: Remove compare and reset from apply bar and fix text.
* commit '
fb6edb42e7e0b132844d4e87c2a76c758f48b684':
Remove compare and reset from apply bar and fix text.
Ruben Brunk [Thu, 11 Oct 2012 01:28:12 +0000 (18:28 -0700)]
Remove compare and reset from apply bar and fix text.
Bug:
7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
Bart Sears [Thu, 11 Oct 2012 07:29:06 +0000 (00:29 -0700)]
am
6190cbd6: am
73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
* commit '
6190cbd657b98f3ba74548f2d883c84cbc290af5':
Hide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 07:27:39 +0000 (00:27 -0700)]
am
23c1f701: am
7761357f: Behavior of camera filmstrip in gallery closer to camera
* commit '
23c1f701d84b2e006afa8f3c9a073fc5a34922cb':
Behavior of camera filmstrip in gallery closer to camera
Bart Sears [Thu, 11 Oct 2012 07:26:59 +0000 (00:26 -0700)]
am
73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
* commit '
73c60ceed9a8df0907cee52d804100f65771f3b6':
Hide unwanted scrollbars in editor
Bobby Georgescu [Thu, 11 Oct 2012 07:25:51 +0000 (00:25 -0700)]
am
7761357f: Behavior of camera filmstrip in gallery closer to camera
* commit '
7761357f4a55de6745ac5172355d1a09a9a37492':
Behavior of camera filmstrip in gallery closer to camera
Bart Sears [Thu, 11 Oct 2012 07:25:17 +0000 (00:25 -0700)]
Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 07:23:10 +0000 (00:23 -0700)]
am
a261467e: am
4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '
a261467ecd5cc8433728185b31e3660c279a3be0':
Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 06:48:52 +0000 (23:48 -0700)]
Behavior of camera filmstrip in gallery closer to camera
Bug:
7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
Bobby Georgescu [Thu, 11 Oct 2012 07:20:40 +0000 (00:20 -0700)]
am
4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '
4d302b8a826ece492c2abefd56b780a65899663e':
Fix NPE in PhotoPage.updateMenuOperations
Bobby Georgescu [Thu, 11 Oct 2012 06:10:36 +0000 (23:10 -0700)]
Hide unwanted scrollbars in editor
Bug:
7327321
Change-Id: I445ea9e223698da2ee587c3f63f1dd0d9b9c692a
Bobby Georgescu [Thu, 11 Oct 2012 05:04:54 +0000 (22:04 -0700)]
Fix NPE in PhotoPage.updateMenuOperations
Bug:
7324012
Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
Bobby Georgescu [Thu, 11 Oct 2012 04:11:50 +0000 (21:11 -0700)]
am
bba49368: am
c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
* commit '
bba49368f54aa24d85b701fbd12a82da8b9e0ea8':
Make album set grid view reflect latest UI mocks
Bobby Georgescu [Thu, 11 Oct 2012 04:10:20 +0000 (21:10 -0700)]
am
3def40b3: am
f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
* commit '
3def40b34a4712fd54fef397e81d4a1b802d37c5':
Defer expensive UI updates in filmstrip
Bobby Georgescu [Thu, 11 Oct 2012 04:10:08 +0000 (21:10 -0700)]
am
c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
* commit '
c735669fdbd1aec674412f43e64b956e8c10b643':
Make album set grid view reflect latest UI mocks
Bobby Georgescu [Thu, 11 Oct 2012 04:09:07 +0000 (21:09 -0700)]
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 04:09:00 +0000 (21:09 -0700)]
am
f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
* commit '
f8a46874235b3169a68f8bd6566c81b44de34e7a':
Defer expensive UI updates in filmstrip
Bobby Georgescu [Thu, 11 Oct 2012 04:08:06 +0000 (21:08 -0700)]
Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
Ruben Brunk [Thu, 11 Oct 2012 03:15:26 +0000 (20:15 -0700)]
am
d4bf5947: am
f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
* commit '
d4bf5947fc8ac24660812ba4bdaddce6d05e301f':
Removed "Show Image State" and "Settings" from overflow menu.
Ruben Brunk [Thu, 11 Oct 2012 03:13:26 +0000 (20:13 -0700)]
am
f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
* commit '
f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3':
Removed "Show Image State" and "Settings" from overflow menu.
Ruben Brunk [Thu, 11 Oct 2012 03:12:32 +0000 (20:12 -0700)]
Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 03:05:21 +0000 (20:05 -0700)]
am
836489b8: am
4e0ca74a: Change "Save" button in editor
* commit '
836489b8e12df6a720adf3149f55aa7da1b2397b':
Change "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 03:03:15 +0000 (20:03 -0700)]
am
4e0ca74a: Change "Save" button in editor
* commit '
4e0ca74a064737b8f90c4f29b29ac17be596a68f':
Change "Save" button in editor
Bobby Georgescu [Thu, 11 Oct 2012 01:16:10 +0000 (18:16 -0700)]
Make album set grid view reflect latest UI mocks
Bug:
7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
Ruben Brunk [Wed, 10 Oct 2012 23:11:51 +0000 (16:11 -0700)]
Removed "Show Image State" and "Settings" from overflow menu.
Bug:
7324739
Change-Id: I0830b70552da76c798d046c8471e7c1fe8fc57df
Bobby Georgescu [Thu, 11 Oct 2012 00:30:45 +0000 (17:30 -0700)]
Change "Save" button in editor
Bug:
Change-Id: Ib395812e0eeb83f6d6089142ba8474bf43cd186a
Bobby Georgescu [Wed, 10 Oct 2012 17:49:51 +0000 (10:49 -0700)]
Defer expensive UI updates in filmstrip
Bug:
7322925
When using the filmstrip, delay expensive updates to
the action bar and share menus, some of which may require
disk accesses, until the rate of change of photos slows
down, instead of doing this work for every single image
that flies by.
Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
George Mount [Thu, 11 Oct 2012 00:05:54 +0000 (17:05 -0700)]
am
2306d785: am
2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
* commit '
2306d785b8a6e965c93b13f7d21da17669af3681':
Fix NPE due to progress bar not existing.
Bobby Georgescu [Thu, 11 Oct 2012 00:05:53 +0000 (17:05 -0700)]
am
2ebc18fb: am
df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
* commit '
2ebc18fbbce184339a7d6e472b3965117335008f':
Change "Done" to "Save" in editor
George Mount [Thu, 11 Oct 2012 00:04:16 +0000 (17:04 -0700)]
am
2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
* commit '
2cb4269ebc665c2f2786a8a81794d15b36e3a38c':
Fix NPE due to progress bar not existing.
Bobby Georgescu [Thu, 11 Oct 2012 00:04:15 +0000 (17:04 -0700)]
am
df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
* commit '
df2aecb6944f1244fa6e3d35a135c8bea6d16ab0':
Change "Done" to "Save" in editor
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
George Mount [Thu, 11 Oct 2012 00:03:10 +0000 (17:03 -0700)]
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:02:27 +0000 (17:02 -0700)]
Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
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
George Mount [Wed, 10 Oct 2012 23:59:45 +0000 (16:59 -0700)]
Fix NPE due to progress bar not existing.
Bug
7325685
Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
Bobby Georgescu [Wed, 10 Oct 2012 23:42:48 +0000 (16:42 -0700)]
Change "Done" to "Save" in editor
Bug:
7325784
Change-Id: I82732252ae6047f1bf50ccde2ede22a9f9bc8e31
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: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
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: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: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: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
Baligh Uddin [Wed, 10 Oct 2012 18:21:40 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa59cf4124259f5c4b66848ee17b751b8420f5a2
Auto-generated-cl: translation import
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: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: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
John Reck [Wed, 10 Oct 2012 16:44:48 +0000 (09:44 -0700)]
Support REVERSE in lockOrientation
Bug:
7314703
Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
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
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: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: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:31:20 +0000 (17:31 -0700)]
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: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: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 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