OSDN Git Service
Svetoslav [Sun, 15 Sep 2013 19:08:46 +0000 (12:08 -0700)]
am
f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
* commit '
f818028e5c78d85bdacd06a6161543d13b42da45':
DO NOT MERGE Cherry-pick:Update Gallery due to API change.
Svetoslav [Sun, 15 Sep 2013 19:07:07 +0000 (19:07 +0000)]
Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
Baligh Uddin [Sun, 15 Sep 2013 04:24:00 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1382bbaf9477eb0834aeac655f9d5f4f44d60af7
Auto-generated-cl: translation import
Baligh Uddin [Sat, 14 Sep 2013 20:01:47 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 14 Sep 2013 07:44:03 +0000 (00:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80dd494cfba2f90ddd98891be2514e7c3f3d96be
Auto-generated-cl: translation import
John Hoford [Sat, 14 Sep 2013 03:36:20 +0000 (20:36 -0700)]
am
a085f59b: Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
* commit '
a085f59b0d36825afd98e6448a5013e5ae73af2a':
removed spinner stuck on screen behind image
nicolasroard [Sat, 14 Sep 2013 03:36:19 +0000 (20:36 -0700)]
am
e30a1cc2: Fix show original
* commit '
e30a1cc28e6724d54ba5b20e73d303e734c05559':
Fix show original
John Hoford [Sat, 14 Sep 2013 03:35:27 +0000 (03:35 +0000)]
Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
John Hoford [Fri, 13 Sep 2013 23:02:09 +0000 (16:02 -0700)]
removed spinner stuck on screen behind image
Change-Id: I71b2743147244c0fbfe352979c84677ac8ef3fb6
nicolasroard [Sat, 14 Sep 2013 00:24:11 +0000 (17:24 -0700)]
Fix show original
Change-Id: Ie3ed508c6a60a06f3bc33fb1b017be219a4c2044
nicolasroard [Sat, 14 Sep 2013 00:26:09 +0000 (17:26 -0700)]
am
edf4b095: Fix various UX bugs
* commit '
edf4b095a1d904df6c02d49e3ec575c5c3c9c749':
Fix various UX bugs
nicolasroard [Fri, 13 Sep 2013 23:37:43 +0000 (16:37 -0700)]
Fix various UX bugs
- boolean filters (invert) working
- default value for vignette
- swappable views un-broken (use
same mechanism as categories views)
Change-Id: I65818c1febbf2c862e97542c8134a1188daf5d62
John Hoford [Fri, 13 Sep 2013 23:05:35 +0000 (16:05 -0700)]
am
bae1c102: remove an Icon change that introduced a bug
* commit '
bae1c10284c23598aa169c7acea0487632ba0da4':
remove an Icon change that introduced a bug
John Hoford [Fri, 13 Sep 2013 21:41:05 +0000 (14:41 -0700)]
remove an Icon change that introduced a bug
cl 358665 introduced a bug in the UI for curves & sharpen
This backs out the change to Editor.java
bug:
10705772
Change-Id: I46edc834c1db55d7ac38906dc60a42b3f2672509
John Hoford [Fri, 13 Sep 2013 17:58:57 +0000 (10:58 -0700)]
am
b55bfb6e: fix crashes in in gallery by reversing previous cl
* commit '
b55bfb6e6000881c56d4de39c9cf71929ed87a18':
fix crashes in in gallery by reversing previous cl
John Hoford [Fri, 13 Sep 2013 17:42:21 +0000 (10:42 -0700)]
fix crashes in in gallery by reversing previous cl
cl 348551 tried to fix a long existing bug which but
introduced race conditions in the system
bug:
10652636
bug:
10551751
bug:
8794694
Change-Id: Ieb617f85df32a5d82293e555621a7e44b8b84708
Svetoslav [Fri, 13 Sep 2013 00:04:30 +0000 (17:04 -0700)]
DO NOT MERGE Cherry-pick:Update Gallery due to API change.
Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8
John Hoford [Fri, 13 Sep 2013 05:10:45 +0000 (22:10 -0700)]
am
bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
* commit '
bc7e9fff7e94bb96fb7fe46080dcde2b81e60817':
Draw UI fixes
John Hoford [Fri, 13 Sep 2013 05:08:22 +0000 (05:08 +0000)]
Merge "Draw UI fixes" into gb-ub-photos-carlsbad
John Hoford [Thu, 12 Sep 2013 14:49:24 +0000 (07:49 -0700)]
Draw UI fixes
bug:
10705772
Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743
Svetoslav [Fri, 13 Sep 2013 01:44:49 +0000 (01:44 +0000)]
Merge "Update Gallery due to API change." into klp-dev
nicolasroard [Fri, 13 Sep 2013 01:04:46 +0000 (18:04 -0700)]
am
7fa373b0: Fix pipeline overstress
* commit '
7fa373b0c3143c2c55a0d72487607d5a05c72e1d':
Fix pipeline overstress
Svetoslav [Fri, 13 Sep 2013 00:04:30 +0000 (17:04 -0700)]
Update Gallery due to API change.
Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8
nicolasroard [Thu, 12 Sep 2013 23:05:05 +0000 (16:05 -0700)]
am
8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
* commit '
8e2a41b7e68338fea06d2a64864348e70d8afe7d':
Fix triangle indicator
nicolasroard [Thu, 12 Sep 2013 22:59:47 +0000 (15:59 -0700)]
Fix pipeline overstress
RenderRequest for filters-only were called too frequently
Change-Id: I04b6a1337d23dcb012544a66b9352f209d98ee72
nicolasroard [Thu, 12 Sep 2013 23:01:33 +0000 (23:01 +0000)]
Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 22:01:09 +0000 (15:01 -0700)]
Fix triangle indicator
bug:
10705772
Change-Id: Ib79f9894c57c77c12f8364fc689638a0aad582e6
Mangesh Ghiware [Thu, 12 Sep 2013 21:28:26 +0000 (14:28 -0700)]
am
fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbad
* commit '
fcf74f8dddddd350466e406f9f1cb2181077ffda':
Enable virtualization
Mangesh Ghiware [Thu, 12 Sep 2013 21:25:54 +0000 (21:25 +0000)]
Merge "Enable virtualization" into gb-ub-photos-carlsbad
John Hoford [Thu, 12 Sep 2013 21:24:19 +0000 (14:24 -0700)]
am
eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
* commit '
eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147':
fix Edit from filmstrip bug
John Hoford [Thu, 12 Sep 2013 21:21:55 +0000 (21:21 +0000)]
Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
John Hoford [Thu, 12 Sep 2013 21:16:50 +0000 (14:16 -0700)]
fix Edit from filmstrip bug
bug:
10707676
Change-Id: Idb27d36713782237a66ee2e06cafb603dc107fb4
Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]
Enable virtualization
When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
Bug:
8767565
Bug:
10727216
Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
(cherry picked from commit
af6b0d2c08afd7803a92856c7c39b5e6144addfa)
nicolasroard [Thu, 12 Sep 2013 17:33:35 +0000 (10:33 -0700)]
am
e10fd688: Fix constrained zoom
* commit '
e10fd68874fa3cff0e5c3ca07f1e5b9d40be1299':
Fix constrained zoom
nicolasroard [Thu, 12 Sep 2013 17:26:57 +0000 (10:26 -0700)]
Fix constrained zoom
Change-Id: I3613ba23154897e9b7c1677ec9911453b5f73c0f
nicolasroard [Thu, 12 Sep 2013 16:08:49 +0000 (09:08 -0700)]
am
34e84323: Fix full-res geometry
* commit '
34e8432353acb0c45253cf4ef855512c7472019b':
Fix full-res geometry
nicolasroard [Thu, 12 Sep 2013 16:08:48 +0000 (09:08 -0700)]
am
5d727d85: Merge "Fix straighten tool" into gb-ub-photos-carlsbad
* commit '
5d727d85d58ad03edbcdd62c533bb14fdd5dda19':
Fix straighten tool
nicolasroard [Thu, 12 Sep 2013 16:08:47 +0000 (09:08 -0700)]
am
3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad
* commit '
3f9e550449ef2d48a81e21fc353dbeb887e07161':
Replace add preset icon
nicolasroard [Thu, 12 Sep 2013 16:08:46 +0000 (09:08 -0700)]
am
b08324d5: Merge "Add custom border text" into gb-ub-photos-carlsbad
* commit '
b08324d588baaebd01a8acd83428f3862c15e7f9':
Add custom border text
nicolasroard [Thu, 12 Sep 2013 16:08:44 +0000 (09:08 -0700)]
am
2d933002: Merge "Fix info panel" into gb-ub-photos-carlsbad
* commit '
2d9330020b929cc75bbdfd645d3dc9278ca78779':
Fix info panel
nicolasroard [Tue, 10 Sep 2013 20:58:30 +0000 (13:58 -0700)]
Fix full-res geometry
Change-Id: I25f2fde1031ba7d896c82484a3da0ea03bcff7b8
nicolasroard [Thu, 12 Sep 2013 01:53:42 +0000 (01:53 +0000)]
Merge "Fix straighten tool" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:53:14 +0000 (01:53 +0000)]
Merge "Replace add preset icon" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:52:53 +0000 (01:52 +0000)]
Merge "Add custom border text" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:52:36 +0000 (01:52 +0000)]
Merge "Fix info panel" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 01:33:41 +0000 (18:33 -0700)]
Fix straighten tool
- fix grid display
- show grid upon launch
- grid disappear after 500ms
bug:
10705772
Change-Id: I499d5e6d9c02ddcc8f540f2bedb58c86cc744e44
nicolasroard [Thu, 12 Sep 2013 01:49:12 +0000 (18:49 -0700)]
Replace add preset icon
bug:
10705772
Change-Id: I6796202cfff4c76c57f1b17646489a1a53d5b95c
nicolasroard [Thu, 12 Sep 2013 00:56:45 +0000 (17:56 -0700)]
Add custom border text
bug:
10705772
Change-Id: Idca8cb3179bf9ecc1b6eaef109f79077cf15ec3c
nicolasroard [Thu, 12 Sep 2013 00:46:38 +0000 (17:46 -0700)]
Fix info panel
bug:
10705772
Change-Id: I9481aec8baf1a7b1782be5cf47acbf3269768cee
Nicolas Roard [Wed, 11 Sep 2013 16:50:16 +0000 (09:50 -0700)]
am
f7630cbd: Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
* commit '
f7630cbd1786f88256e03c246a2931b3734ab82f':
Handle IllegalStateException when cursor contents are empty
Nicolas Roard [Wed, 11 Sep 2013 16:48:38 +0000 (16:48 +0000)]
Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
Amith Yamasani [Wed, 11 Sep 2013 00:25:52 +0000 (17:25 -0700)]
Handle IllegalStateException when cursor contents are empty
Bug:
10696306
Change-Id: If56b553e34574219de8e3990c9e256f698d08f04
John Hoford [Wed, 11 Sep 2013 00:41:14 +0000 (17:41 -0700)]
am
2975e608: Merge "fix startup crash" into gb-ub-photos-carlsbad
* commit '
2975e608d638a6d707b64a5b31fde3716f12ee9c':
fix startup crash
John Hoford [Wed, 11 Sep 2013 00:38:50 +0000 (00:38 +0000)]
Merge "fix startup crash" into gb-ub-photos-carlsbad
Mangesh Ghiware [Wed, 11 Sep 2013 00:21:05 +0000 (17:21 -0700)]
am
da713ad2: Make local copy of reference to bitmap and check for null
* commit '
da713ad257719520234fc071c3d11deea8125ed6':
Make local copy of reference to bitmap and check for null
Mangesh Ghiware [Tue, 10 Sep 2013 22:34:22 +0000 (15:34 -0700)]
Make local copy of reference to bitmap and check for null
Bug:
8694871
Change-Id: If9505a017a86fd6bc8c4a193e6da7167a2af1a27
John Hoford [Tue, 10 Sep 2013 23:59:23 +0000 (16:59 -0700)]
fix startup crash
bug:
10673620
Change-Id: If1a8aad0c2258702fe4fc7048b4e82eea302169c
Baligh Uddin [Tue, 10 Sep 2013 14:27:57 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Tue, 10 Sep 2013 03:29:40 +0000 (20:29 -0700)]
am
fddcb482: small ui fixes in draw
* commit '
fddcb482a89e6c30f74f0c8cf7d9d1e6e31a5789':
small ui fixes in draw
John Hoford [Tue, 10 Sep 2013 00:54:37 +0000 (17:54 -0700)]
small ui fixes in draw
Change-Id: I3d960de02d053cf7a70eeacf773dbe51da69f492
John Hoford [Mon, 9 Sep 2013 22:40:20 +0000 (15:40 -0700)]
am
3404ab27: Merge "fix export on saved images" into gb-ub-photos-carlsbad
* commit '
3404ab27a2107880e0c8e96b910de18a47b84b05':
fix export on saved images
John Hoford [Mon, 9 Sep 2013 22:38:10 +0000 (22:38 +0000)]
Merge "fix export on saved images" into gb-ub-photos-carlsbad
John Hoford [Mon, 9 Sep 2013 20:04:54 +0000 (13:04 -0700)]
fix export on saved images
bug:
9466453
Change-Id: I6280e6352d6c7f672692db514e46803df3f91b38
nicolasroard [Mon, 9 Sep 2013 21:13:48 +0000 (14:13 -0700)]
am
9346e7fd: Hide debug statement
* commit '
9346e7fdd448c5ddfc3e47c067618ca0ac9c72fa':
Hide debug statement
Baligh Uddin [Mon, 9 Sep 2013 21:10:34 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic9b7aedf23b914046ee05dd26fb0b670cad65970
Auto-generated-cl: translation import
nicolasroard [Mon, 9 Sep 2013 21:03:45 +0000 (14:03 -0700)]
Hide debug statement
Change-Id: I978e84cdec3739efa7e5a7f6acf3b23625a5355b
nicolasroard [Mon, 9 Sep 2013 18:25:46 +0000 (11:25 -0700)]
am
16a8079b: Fix for anim stutter
* commit '
16a8079bfddf54ef2c110fba53dadac8512403b8':
Fix for anim stutter
nicolasroard [Mon, 9 Sep 2013 18:17:30 +0000 (11:17 -0700)]
Fix for anim stutter
Change-Id: Id1b3c9b18e65b4a817b15ee45d0f9dc514a4b700
Mangesh Ghiware [Mon, 9 Sep 2013 17:07:26 +0000 (10:07 -0700)]
am
f8faf052: Merge "Exclude trampoline activity from Recents" into gb-ub-photos-carlsbad
* commit '
f8faf0520598abc984bae6d6273c6ab0b9f475bd':
Exclude trampoline activity from Recents
Mangesh Ghiware [Mon, 9 Sep 2013 17:03:18 +0000 (17:03 +0000)]
Merge "Exclude trampoline activity from Recents" into gb-ub-photos-carlsbad
Mangesh Ghiware [Mon, 9 Sep 2013 16:42:09 +0000 (09:42 -0700)]
Exclude trampoline activity from Recents
Bug:
10653067
Change-Id: I79b4cb66886a63d19139cb9cb7272a754320b256
nicolasroard [Mon, 9 Sep 2013 15:57:05 +0000 (08:57 -0700)]
am
ec1e009a: Improves memory management
* commit '
ec1e009a7faea0478e361bc2d48d856ab48a0209':
Improves memory management
nicolasroard [Mon, 9 Sep 2013 06:14:57 +0000 (23:14 -0700)]
Improves memory management
Also adds some debugging tracking tools.
bug:
10112287
Change-Id: I3f9b3d173db99818e5c9ae9a62b0ec38cd2b341b
nicolasroard [Sat, 7 Sep 2013 01:00:42 +0000 (18:00 -0700)]
am
34cfdfcd: Fix information panel
* commit '
34cfdfcd1867fff67fffbbac7a8e942485f08ea1':
Fix information panel
nicolasroard [Sat, 7 Sep 2013 00:54:51 +0000 (17:54 -0700)]
Fix information panel
bug:
10429488
Change-Id: I80e9e58ba907129cc7b4f5c7f9fafe95d49d86b0
nicolasroard [Sat, 7 Sep 2013 00:44:34 +0000 (17:44 -0700)]
am
32cc4dd7: Fix UI performances / glitches
* commit '
32cc4dd751569721aa19218b4d947145577060d0':
Fix UI performances / glitches
nicolasroard [Sat, 7 Sep 2013 00:21:55 +0000 (17:21 -0700)]
Fix UI performances / glitches
- load/process thumbnails fully in background
- fix reveal slider
- fix race condition when loading
- better memory usage
- fix loading spinner (wasn't shown!)
Change-Id: Id78163556d8ee1c3ad04eae16fe1bf06f4312405
John Hoford [Fri, 6 Sep 2013 23:41:05 +0000 (16:41 -0700)]
am
98b296ff: fix Gallery crash while deleting a picture
* commit '
98b296ffc50e11b7950acf1d0df850b617913131':
fix Gallery crash while deleting a picture
John Hoford [Fri, 6 Sep 2013 22:02:21 +0000 (15:02 -0700)]
fix Gallery crash while deleting a picture
bug:
10551751
Change-Id: I9b6a8488b4fa2a3440b85ae8e4c5dc3da83e29f1
John Hoford [Fri, 6 Sep 2013 21:20:11 +0000 (14:20 -0700)]
John Hoford [Fri, 6 Sep 2013 04:15:18 +0000 (21:15 -0700)]
fix vignette
Change-Id: I368e34d11eecad7da80531f88d52cf6c4a3b4901
Svetoslav [Fri, 6 Sep 2013 15:18:29 +0000 (08:18 -0700)]
am
a78a4897: Update the Gallery API due to API change
* commit '
a78a4897c88edea4374e5102d5e1901fd46e566d':
Update the Gallery API due to API change
Svetoslav [Tue, 3 Sep 2013 21:34:40 +0000 (14:34 -0700)]
Update the Gallery API due to API change
This is a cherry-pick of Svetoslav's fix in klp-dev: https://googleplex-android-review.git.corp.google.com/#/c/353376/
Change-Id: Icf61ff059da24630aca8b7eb00575d12cf85e2fb
John Hoford [Thu, 5 Sep 2013 16:46:57 +0000 (09:46 -0700)]
am
4196c7da: remove title bar from color picker dialog
* commit '
4196c7da24f0393887a9eb4f3bbfebfbc122d3b0':
remove title bar from color picker dialog
Svetoslav [Thu, 5 Sep 2013 05:37:01 +0000 (05:37 +0000)]
Merge "Update the Gallery API due to API change" into klp-dev
Svetoslav [Tue, 3 Sep 2013 21:34:40 +0000 (14:34 -0700)]
Update the Gallery API due to API change
Change-Id: Icf61ff059da24630aca8b7eb00575d12cf85e2fb
John Hoford [Thu, 5 Sep 2013 00:20:04 +0000 (17:20 -0700)]
remove title bar from color picker dialog
Change-Id: I242ded7941dab60a1501dbb4f34dcafbfe302bd3
John Hoford [Wed, 4 Sep 2013 22:38:13 +0000 (15:38 -0700)]
am
805a7fe5: put back shade in crop and straighten
* commit '
805a7fe57da2534462f4720abc7fe9cdb8f7ecc9':
put back shade in crop and straighten
John Hoford [Wed, 4 Sep 2013 20:53:29 +0000 (13:53 -0700)]
put back shade in crop and straighten
Change-Id: I046d98ea61f93d00131eaa7e7058a16bc1be0adc
John Hoford [Wed, 4 Sep 2013 15:58:05 +0000 (08:58 -0700)]
am
ec1f9150: fix crop issues
* commit '
ec1f915006e5ec2db8be633b5d3d73e568951da4':
fix crop issues
Baligh Uddin [Wed, 4 Sep 2013 05:05:22 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:04:57 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Tue, 3 Sep 2013 14:48:29 +0000 (07:48 -0700)]
fix crop issues
Change-Id: I885828b041278531fbcbe203d413131ad8f46613
Baligh Uddin [Tue, 3 Sep 2013 21:47:28 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia93bf9c4d99688cf6f64c25332a36c8a79f8b942
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 Sep 2013 21:44:27 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I425517e28d8df11155eea0b6eb32f97aa691f41d
Auto-generated-cl: translation import
nicolasroard [Tue, 3 Sep 2013 19:01:53 +0000 (12:01 -0700)]
am
b95b3e9d: Merge "Fix graphic pipeline cache" into gb-ub-photos-carlsbad
* commit '
b95b3e9d5be75687e5f07cc2b245c27074ce4cf9':
Fix graphic pipeline cache
nicolasroard [Tue, 3 Sep 2013 19:00:18 +0000 (19:00 +0000)]
Merge "Fix graphic pipeline cache" into gb-ub-photos-carlsbad
nicolasroard [Tue, 3 Sep 2013 15:40:42 +0000 (08:40 -0700)]
Fix graphic pipeline cache
Some bitmaps were thrown back
into the bitmap pool while still
used in the caching pipeline...
Change-Id: I56c47b44d137f16b9a9a6cf79224c296ea6e55a0
ztenghui [Tue, 3 Sep 2013 16:38:18 +0000 (09:38 -0700)]
am
cac4cedc: Merge "Show the action bar and edit button when system clear full screen flag." into gb-ub-photos-carlsbad
* commit '
cac4cedc989b53fdf6b8b46363b3e722c5605cff':
Show the action bar and edit button when system clear full screen flag.
ztenghui [Tue, 3 Sep 2013 16:38:17 +0000 (09:38 -0700)]
am
417f074d: Play the video on top of lock screen
* commit '
417f074dbcf07843bf02e762c2fe3b23fe8af32b':
Play the video on top of lock screen