OSDN Git Service
nicolasroard [Mon, 16 Sep 2013 17:26:24 +0000 (10:26 -0700)]
nicolasroard [Mon, 16 Sep 2013 17:24:28 +0000 (10:24 -0700)]
am
31586343: am
fcdbaf87: Remove Draw tool
* commit '
31586343017b4d7baf48fe325f3c8517418e45ff':
Remove Draw tool
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:58:52 +0000 (09:58 -0700)]
am
9933d149: am
685f2f7d: am
9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
* commit '
9933d1497b4da00904e600c4b0e0017d29e0e5ef':
Fix flickering while editing
nicolasroard [Mon, 16 Sep 2013 16:55:52 +0000 (09:55 -0700)]
am
685f2f7d: am
9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
* commit '
685f2f7d46410376074c8318263fbd42bf09392a':
Fix flickering while editing
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:15:03 +0000 (12:15 -0700)]
am
1d21c277: (-s ours) am
16c47292: am
f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
* commit '
1d21c27787a3700af1a24d8eff6b7963e6ddb099':
DO NOT MERGE Cherry-pick:Update Gallery due to API change.
Svetoslav [Sun, 15 Sep 2013 19:12:32 +0000 (12:12 -0700)]
am
16c47292: am
f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
* commit '
16c4729234802ee0dabebf1a837a1435b58c8efa':
DO NOT MERGE Cherry-pick:Update Gallery due to API change.
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:48:38 +0000 (21:48 -0700)]
am
a130424c: (-s ours) am
71dc622d: (-s ours) Import translations. DO NOT MERGE
* commit '
a130424cf8a6dd5d8d51a81e71390ae9d7e96301':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 04:46:49 +0000 (21:46 -0700)]
am
71dc622d: (-s ours) Import translations. DO NOT MERGE
* commit '
71dc622d3d5ecfcd9905215b27c90b49fe8765b0':
Import translations. DO NOT MERGE
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:07:52 +0000 (13:07 -0700)]
am
4c6bf046: (-s ours) am
cd9dbf0b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c6bf046428e38b1024d35908cc3bff67ff037e4':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:05:02 +0000 (13:05 -0700)]
am
cd9dbf0b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cd9dbf0bbc86de3be45f8f2213c212f9c4721462':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:01:51 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE"
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 20:01:38 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 14 Sep 2013 07:44:37 +0000 (00:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: If399feec49a2313053cbbed4c58f1be505b82185
Auto-generated-cl: translation import
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
Baligh Uddin [Sat, 14 Sep 2013 07:40:05 +0000 (00:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia32b56ecaadaeee6e76cf8a5c6b8509979cff0f0
Auto-generated-cl: translation import
John Hoford [Sat, 14 Sep 2013 03:39:57 +0000 (20:39 -0700)]
am
c696ee7a: am
a6f544ae: am
a085f59b: Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
* commit '
c696ee7a28d25387095de2d6888dca259bca7ff8':
removed spinner stuck on screen behind image
nicolasroard [Sat, 14 Sep 2013 03:39:56 +0000 (20:39 -0700)]
John Hoford [Sat, 14 Sep 2013 03:38:00 +0000 (20:38 -0700)]
am
a6f544ae: am
a085f59b: Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
* commit '
a6f544ae0322531bce34991f238277a0657fab76':
removed spinner stuck on screen behind image
nicolasroard [Sat, 14 Sep 2013 03:37:59 +0000 (20:37 -0700)]
am
2208eae6: am
e30a1cc2: Fix show original
* commit '
2208eae6471c89b0c36a983b8f8d165e05904cbb':
Fix show original
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:37:19 +0000 (17:37 -0700)]
am
bbd867a0: am
4f05d51f: am
edf4b095: Fix various UX bugs
* commit '
bbd867a08ad42b28b2b5840b3aea641a2aa70e01':
Fix various UX bugs
John Hoford [Sat, 14 Sep 2013 00:31:51 +0000 (17:31 -0700)]
am
813df7cf: am
74e981f3: am
bae1c102: remove an Icon change that introduced a bug
* commit '
813df7cf8860432b489f1e83575091f71bcd0d1f':
remove an Icon change that introduced a bug
nicolasroard [Sat, 14 Sep 2013 00:30:07 +0000 (17:30 -0700)]
am
4f05d51f: am
edf4b095: Fix various UX bugs
* commit '
4f05d51f2bb51ff545a944b9314a6ea76dea029b':
Fix various UX bugs
nicolasroard [Sat, 14 Sep 2013 00:26:09 +0000 (17:26 -0700)]
am
edf4b095: Fix various UX bugs
* commit '
edf4b095a1d904df6c02d49e3ec575c5c3c9c749':
Fix various UX bugs
John Hoford [Sat, 14 Sep 2013 00:15:20 +0000 (17:15 -0700)]
am
74e981f3: am
bae1c102: remove an Icon change that introduced a bug
* commit '
74e981f38ac8e35814343eecaf571d1e7e5ea544':
remove an Icon change that introduced a bug
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 20:26:48 +0000 (13:26 -0700)]
am
75d70625: am
2187c9c5: am
b55bfb6e: fix crashes in in gallery by reversing previous cl
* commit '
75d70625d21590bf36dad183fbbdc0a8818a256a':
fix crashes in in gallery by reversing previous cl
John Hoford [Fri, 13 Sep 2013 20:20:41 +0000 (13:20 -0700)]
am
2187c9c5: am
b55bfb6e: fix crashes in in gallery by reversing previous cl
* commit '
2187c9c5e41984378d2b333f65bc62e6922fbc6e':
fix crashes in in gallery by reversing previous cl
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:15:39 +0000 (22:15 -0700)]
am
e762cca7: am
18277855: am
bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
* commit '
e762cca761b2ba649fe47b41d71ce0062b946b22':
Draw UI fixes
John Hoford [Fri, 13 Sep 2013 05:13:36 +0000 (22:13 -0700)]
am
18277855: am
bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
* commit '
18277855f7d3b236aad25f752f2d0dce9887fc1f':
Draw UI fixes
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
Svetoslav [Fri, 13 Sep 2013 04:42:01 +0000 (21:42 -0700)]
am
ea08f4a8: am
b6f868b5: Merge "Update Gallery due to API change." into klp-dev
* commit '
ea08f4a8d932502174cd60d87da3c79d86e9a8de':
Update Gallery due to API change.
nicolasroard [Fri, 13 Sep 2013 04:42:00 +0000 (21:42 -0700)]
am
0b7454cf: am
5db6307d: am
7fa373b0: Fix pipeline overstress
* commit '
0b7454cf77ea93ecc394d4ee4bdbc1a4fe13146d':
Fix pipeline overstress
nicolasroard [Fri, 13 Sep 2013 04:41:59 +0000 (21:41 -0700)]
am
7343f946: am
004fcfc7: am
8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
* commit '
7343f946319fbd79a87872657445c12ed2bd5abc':
Fix triangle indicator
Svetoslav [Fri, 13 Sep 2013 04:37:38 +0000 (21:37 -0700)]
am
b6f868b5: Merge "Update Gallery due to API change." into klp-dev
* commit '
b6f868b5517269980aea965ac97d0943cbb023f0':
Update Gallery due to API change.
nicolasroard [Fri, 13 Sep 2013 04:37:28 +0000 (21:37 -0700)]
am
5db6307d: am
7fa373b0: Fix pipeline overstress
* commit '
5db6307de500d7774626713e76b559afd94b1096':
Fix pipeline overstress
nicolasroard [Fri, 13 Sep 2013 04:36:50 +0000 (21:36 -0700)]
am
004fcfc7: am
8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
* commit '
004fcfc7d13c1c35a059b39f16e9121883fd6739':
Fix triangle indicator
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
Mangesh Ghiware [Thu, 12 Sep 2013 23:45:03 +0000 (16:45 -0700)]
am
b18de47f: am
39a155c7: am
fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbad
* commit '
b18de47f9ddd5964bc2975638e4dafc07f283e3e':
Enable virtualization
John Hoford [Thu, 12 Sep 2013 23:45:02 +0000 (16:45 -0700)]
am
1844b200: am
75974071: am
eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
* commit '
1844b200986e4e69455d25d9304b44ed04073379':
fix Edit from filmstrip bug
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:33:09 +0000 (14:33 -0700)]
am
39a155c7: am
fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbad
* commit '
39a155c78821c4049a55f06810912a2ac5bc62e2':
Enable virtualization
John Hoford [Thu, 12 Sep 2013 21:29:46 +0000 (14:29 -0700)]
am
75974071: am
eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
* commit '
759740717fc8ae3515a50196e40417b27ca59089':
fix Edit from filmstrip bug
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:38:28 +0000 (10:38 -0700)]
am
bef57819: am
cdc5ceac: am
e10fd688: Fix constrained zoom
* commit '
bef578192b63f954b4f1044e59dc6d050e861017':
Fix constrained zoom
nicolasroard [Thu, 12 Sep 2013 17:35:17 +0000 (10:35 -0700)]
am
cdc5ceac: am
e10fd688: Fix constrained zoom
* commit '
cdc5ceac62eca08eed47f55b1aeb7bd01ca13cff':
Fix constrained zoom
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:27:33 +0000 (09:27 -0700)]
am
3c2cdb00: am
cf360646: am
34e84323: Fix full-res geometry
* commit '
3c2cdb00c22fb236d09a924311cc5e19cb0f39f1':
Fix full-res geometry
nicolasroard [Thu, 12 Sep 2013 16:27:32 +0000 (09:27 -0700)]
am
e9800eb6: am
09b825b1: am
5d727d85: Merge "Fix straighten tool" into gb-ub-photos-carlsbad
* commit '
e9800eb6e6979647e7f0d8af849542c7da099efd':
Fix straighten tool
nicolasroard [Thu, 12 Sep 2013 16:27:32 +0000 (09:27 -0700)]
am
3ad349a5: am
7a3df681: am
3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad
* commit '
3ad349a5aea13ba7fa864f2ca68616667fc858d5':
Replace add preset icon
nicolasroard [Thu, 12 Sep 2013 16:27:31 +0000 (09:27 -0700)]
am
67af05e6: am
a96ba88e: am
b08324d5: Merge "Add custom border text" into gb-ub-photos-carlsbad
* commit '
67af05e6c9df9924d7b694130e7ad6aa908ed3a7':
Add custom border text
nicolasroard [Thu, 12 Sep 2013 16:27:31 +0000 (09:27 -0700)]
am
a975b198: am
738602a7: am
2d933002: Merge "Fix info panel" into gb-ub-photos-carlsbad
* commit '
a975b198208d285d0d34d6a12c4fa397e41755ee':
Fix info panel
nicolasroard [Thu, 12 Sep 2013 16:21:28 +0000 (09:21 -0700)]
am
cf360646: am
34e84323: Fix full-res geometry
* commit '
cf360646a5373adff965d4426feb4c2cbdfb09d0':
Fix full-res geometry
nicolasroard [Thu, 12 Sep 2013 16:21:27 +0000 (09:21 -0700)]
am
09b825b1: am
5d727d85: Merge "Fix straighten tool" into gb-ub-photos-carlsbad
* commit '
09b825b11839f85fa4a68c0cc133abc9f70cd2b0':
Fix straighten tool
nicolasroard [Thu, 12 Sep 2013 16:21:26 +0000 (09:21 -0700)]
am
7a3df681: am
3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad
* commit '
7a3df681bc6e85e9ad9bd47ec7a811d4a1d4a2f1':
Replace add preset icon
nicolasroard [Thu, 12 Sep 2013 16:21:26 +0000 (09:21 -0700)]
am
a96ba88e: am
b08324d5: Merge "Add custom border text" into gb-ub-photos-carlsbad
* commit '
a96ba88e48c6e04b51d1c883d178a38d854197f7':
Add custom border text
nicolasroard [Thu, 12 Sep 2013 16:21:25 +0000 (09:21 -0700)]
am
738602a7: am
2d933002: Merge "Fix info panel" into gb-ub-photos-carlsbad
* commit '
738602a7cdbcb7312965e6ce0b7cb7bd545054b8':
Fix info panel
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
Baligh Uddin [Thu, 12 Sep 2013 03:17:04 +0000 (03:17 +0000)]
Merge "Import translations. DO NOT MERGE"
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