OSDN Git Service
John Hoford [Fri, 20 Sep 2013 23:24:58 +0000 (16:24 -0700)]
am
e56abc70: prevent editing of GIF
* commit '
e56abc7049e35f705161086fe51d0ecdbf451b8b':
prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 22:14:51 +0000 (15:14 -0700)]
prevent editing of GIF
bug:
10642974
Change-Id: Ic61da19f6106c9d42c5b39ae9cc0cf0765f6d1ae
John Hoford [Fri, 20 Sep 2013 21:13:47 +0000 (14:13 -0700)]
am
c491ad2b: remove print for video
* commit '
c491ad2b7630eed7cf43ef0c1064bd4fe42e06a1':
remove print for video
John Hoford [Fri, 20 Sep 2013 20:50:37 +0000 (13:50 -0700)]
remove print for video
bug:
10455873
Change-Id: I8f62881b95ad8cd3fff73452eb7d91b05b1ddd8d
John Hoford [Fri, 20 Sep 2013 16:27:20 +0000 (09:27 -0700)]
am
36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
* commit '
36a1262a0138c64b56595b1209bac92d00211f51':
Fix string capitalization
John Hoford [Fri, 20 Sep 2013 16:27:19 +0000 (09:27 -0700)]
am
76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
* commit '
76ef9162b8323a6a48e339895cbd8d428a74a230':
fix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 16:24:21 +0000 (16:24 +0000)]
Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:08 +0000 (16:24 +0000)]
Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:00:06 +0000 (09:00 -0700)]
Fix string capitalization
bug:
10487803
Change-Id: I16c18388ac47851f3fffcca8be13eb77b60ddbfb
John Hoford [Fri, 20 Sep 2013 14:41:52 +0000 (07:41 -0700)]
fix grid drawing bug in ImageStraighten
Change-Id: I4fec941385dd819afc30922823a087cd9962824b
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.
bug:
10461180
Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
Mangesh Ghiware [Thu, 19 Sep 2013 23:44:13 +0000 (16:44 -0700)]
am
6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
* commit '
6904a72d84d6662c00be83186468600f84448590':
Use the same taskAffinity for trampoline as Camera
Mangesh Ghiware [Thu, 19 Sep 2013 23:42:02 +0000 (23:42 +0000)]
Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 22:56:15 +0000 (15:56 -0700)]
Use the same taskAffinity for trampoline as Camera
Bug:
10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
Baligh Uddin [Thu, 19 Sep 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Thu, 19 Sep 2013 19:25:41 +0000 (12:25 -0700)]
am
962cf04c: change the max print resolution
* commit '
962cf04c60249c2d116f9ee07e747180bee46014':
change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:04:41 +0000 (12:04 -0700)]
change the max print resolution
Change-Id: Ie2cc1c3f40675ae163438c9b09f26e4ac1881367
John Hoford [Thu, 19 Sep 2013 17:09:27 +0000 (10:09 -0700)]
am
cdd4b82b: remove analytics
* commit '
cdd4b82b85f5e134b3357e75d735c5faeada70c9':
remove analytics
John Hoford [Thu, 19 Sep 2013 16:48:37 +0000 (09:48 -0700)]
remove analytics
bug:
9467671
Change-Id: I0d0cfc31e152605c42313db5f6603dbccf76fd82
Baligh Uddin [Thu, 19 Sep 2013 10:26:12 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icfe62e061cfb39b257f80aee1605601f3d57ebed
Auto-generated-cl: translation import
John Hoford [Wed, 18 Sep 2013 17:19:08 +0000 (10:19 -0700)]
am
9029a469: fix grad filter brightness value stuck at -100
* commit '
9029a469b47605420454e0c74d46adeccf4ef94a':
fix grad filter brightness value stuck at -100
John Hoford [Wed, 18 Sep 2013 17:02:53 +0000 (10:02 -0700)]
fix grad filter brightness value stuck at -100
Change-Id: I8e0fa1e0b9537fc530fecb78aac019c220af7ae2
John Hoford [Tue, 17 Sep 2013 23:44:34 +0000 (16:44 -0700)]
am
b17765a3: fix bug in saving preset
* commit '
b17765a3e9ead269493d7a851a21af3622931c40':
fix bug in saving preset
John Hoford [Tue, 17 Sep 2013 23:31:27 +0000 (16:31 -0700)]
fix bug in saving preset
bug introduced in CL 361110
Change-Id: I8fd283859d0f0f6a4b9e06e95c533b68085c156a
John Hoford [Tue, 17 Sep 2013 22:49:59 +0000 (15:49 -0700)]
am
b867739b: display menu indicator in crop
* commit '
b867739b4b748fd702b693843220e7691c2e5979':
display menu indicator in crop
John Hoford [Tue, 17 Sep 2013 22:42:08 +0000 (15:42 -0700)]
display menu indicator in crop
Change-Id: I3ecde3c5e01ace32347e216f2eeb50643e1d9019
John Hoford [Tue, 17 Sep 2013 21:01:22 +0000 (14:01 -0700)]
am
35e91fcc: clean up translation issues
* commit '
35e91fcc4143cb1aaaa99a098512bdccb8b27646':
clean up translation issues
John Hoford [Tue, 17 Sep 2013 20:24:35 +0000 (13:24 -0700)]
clean up translation issues
bug:
10319758
bug:
10320401
bug:
10317664
Change-Id: Idef2803093382a75d348fe8b5077bb0d6c9ff6b4
John Hoford [Tue, 17 Sep 2013 19:58:03 +0000 (12:58 -0700)]
am
8a0072e5: remove translation in jason encoding
* commit '
8a0072e519157b976d7d1fd34ca2aa1c849a983b':
remove translation in jason encoding
John Hoford [Tue, 17 Sep 2013 18:13:48 +0000 (11:13 -0700)]
remove translation in jason encoding
Change-Id: I26c1ae312b3ba71efc40fe0675f53d6b2c377bed
nicolasroard [Tue, 17 Sep 2013 17:53:44 +0000 (10:53 -0700)]
am
6aea6b7f: Fix ImagePreset handling
* commit '
6aea6b7f4014968fc414554c1530b16437364c80':
Fix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 17:53:43 +0000 (10:53 -0700)]
am
ef8d4d2c: Use edge glow instead of snap back
* commit '
ef8d4d2cfbd1ee16d5646a9460a56302d06a0784':
Use edge glow instead of snap back
nicolasroard [Tue, 17 Sep 2013 16:06:57 +0000 (09:06 -0700)]
Fix ImagePreset handling
- fix border ordering
- fix Fx apply
Change-Id: Icf407431a77e150d255d416b983dacb8df5f73fb
nicolasroard [Tue, 17 Sep 2013 07:51:20 +0000 (00:51 -0700)]
Use edge glow instead of snap back
Follow UX guidelines.
Change-Id: Id81d6622e174c8bb2ac53d8b04023070368d945d
Baligh Uddin [Tue, 17 Sep 2013 04:18:08 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Mon, 16 Sep 2013 23:02:16 +0000 (16:02 -0700)]
am
463b918e: Prevent edit during view photo intent
* commit '
463b918edda204f1563dc2e27976cafa6af9a769':
Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 22:51:02 +0000 (15:51 -0700)]
Prevent edit during view photo intent
bug:
9862016
Change-Id: I58e64765630f686f49836dbfb7a7447910e714ef
John Hoford [Mon, 16 Sep 2013 20:24:39 +0000 (13:24 -0700)]
am
5921b53e: add clear back to draw UI
* commit '
5921b53e411a1ee5de8daea34fda90c2ada31974':
add clear back to draw UI
Baligh Uddin [Mon, 16 Sep 2013 19:54:47 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib7ab8c9bda8305be3d050b9fd47a644bcd43afb1
Auto-generated-cl: translation import
John Hoford [Mon, 16 Sep 2013 19:53:57 +0000 (12:53 -0700)]
add clear back to draw UI
Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa
nicolasroard [Mon, 16 Sep 2013 17:20:42 +0000 (10:20 -0700)]
am
fcdbaf87: Remove Draw tool
* commit '
fcdbaf87020ef96252f57575e5cfc6df11042ab3':
Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 16:51:44 +0000 (09:51 -0700)]
Remove Draw tool
bug:
10734199
Change-Id: I36f6f63a12b79e6faba8c31f1f90ee13a220e8af
nicolasroard [Mon, 16 Sep 2013 16:52:31 +0000 (09:52 -0700)]
am
9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
* commit '
9d36d82ff910478a06d186ea7f0eb643ea342551':
Fix flickering while editing
nicolasroard [Mon, 16 Sep 2013 16:49:23 +0000 (16:49 +0000)]
Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
nicolasroard [Mon, 16 Sep 2013 16:33:57 +0000 (09:33 -0700)]
Fix flickering while editing
Change-Id: Ic06e0c59059d97f8dd7c150d22746c1f90d7bed1
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
OSDN Git Service
