OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoam 024e3ab4: (-s ours) am 37a6c20e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 17 Sep 2013 04:27:27 +0000 (21:27 -0700)]
am 024e3ab4: (-s ours) am 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '024e3ab4b9ca4a66955f1304bea25e5de591fc9a':
  Import translations. DO NOT MERGE

10 years agoam 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:22:25 +0000 (21:22 -0700)]
am 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '37a6c20e692a1d4f7bd5e4903ec9869b365f086f':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Sep 2013 04:18:14 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:18:08 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Sep 2013 04:17:57 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 24d8850e: am 62ab53eb: am 463b918e: Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 23:07:47 +0000 (16:07 -0700)]
am 24d8850e: am 62ab53eb: am 463b918e: Prevent edit during view photo intent

* commit '24d8850ea56e79e7f3e013eb93b324971ed57b27':
  Prevent edit during view photo intent

10 years agoam 62ab53eb: am 463b918e: Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 23:04:47 +0000 (16:04 -0700)]
am 62ab53eb: am 463b918e: Prevent edit during view photo intent

* commit '62ab53ebc53d20b8d0ed661dbb195cc55e8f445a':
  Prevent edit during view photo intent

10 years agoam 463b918e: Prevent edit during view photo intent
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

10 years agoPrevent 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

10 years agoam 6b2171a7: am 81734418: am 5921b53e: add clear back to draw UI
John Hoford [Mon, 16 Sep 2013 20:31:49 +0000 (13:31 -0700)]
am 6b2171a7: am 81734418: am 5921b53e: add clear back to draw UI

* commit '6b2171a7552108078f54b62a0fb855e1daa86d60':
  add clear back to draw UI

10 years agoam 81734418: am 5921b53e: add clear back to draw UI
John Hoford [Mon, 16 Sep 2013 20:29:02 +0000 (13:29 -0700)]
am 81734418: am 5921b53e: add clear back to draw UI

* commit '8173441875547320cae134d9e2730f20b67ad274':
  add clear back to draw UI

10 years agoam 5921b53e: add clear back to draw UI
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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:55:28 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0dcfe0ed41f63bbc7fea918652e7af84f171f232
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
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

10 years agoadd clear back to draw UI
John Hoford [Mon, 16 Sep 2013 19:53:57 +0000 (12:53 -0700)]
add clear back to draw UI

Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:50:28 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I596827ac67274fa85aa4bf3c20c3f7da4f6c1a20
Auto-generated-cl: translation import

10 years agoam 2aa6ad8b: am 31586343: am fcdbaf87: Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 17:26:24 +0000 (10:26 -0700)]
am 2aa6ad8b: am 31586343: am fcdbaf87: Remove Draw tool

* commit '2aa6ad8b10773d743fb9e9430f14a87e39fb3973':
  Remove Draw tool

10 years agoam 31586343: am fcdbaf87: Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 17:24:28 +0000 (10:24 -0700)]
am 31586343: am fcdbaf87: Remove Draw tool

* commit '31586343017b4d7baf48fe325f3c8517418e45ff':
  Remove Draw tool

10 years agoam fcdbaf87: 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

10 years agoam 9933d149: am 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into...
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

10 years agoam 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos...
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

10 years agoRemove Draw tool
nicolasroard [Mon, 16 Sep 2013 16:51:44 +0000 (09:51 -0700)]
Remove Draw tool

bug:10734199
Change-Id: I36f6f63a12b79e6faba8c31f1f90ee13a220e8af

10 years agoam 9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix flickering while editing" into gb-ub-photos-carlsbad
nicolasroard [Mon, 16 Sep 2013 16:49:23 +0000 (16:49 +0000)]
Merge "Fix flickering while editing" into gb-ub-photos-carlsbad

10 years agoFix flickering while editing
nicolasroard [Mon, 16 Sep 2013 16:33:57 +0000 (09:33 -0700)]
Fix flickering while editing

Change-Id: Ic06e0c59059d97f8dd7c150d22746c1f90d7bed1

10 years agoam 1d21c277: (-s ours) am 16c47292: am f818028e: (-s ours) Merge "DO NOT MERGE Cherry...
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.

10 years agoam 16c47292: am f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery...
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.

10 years agoam f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API...
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.

10 years agoMerge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos...
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

10 years agoam a130424c: (-s ours) am 71dc622d: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam 71dc622d: (-s ours) 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

10 years agoImport 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

10 years agoam 4c6bf046: (-s ours) am cd9dbf0b: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam cd9dbf0b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 14 Sep 2013 20:01:51 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 14 Sep 2013 20:01:47 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 14 Sep 2013 20:01:38 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport 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

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam c696ee7a: am a6f544ae: am a085f59b: Merge "removed spinner stuck on screen behind...
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

10 years agoam b10427af: am 2208eae6: am e30a1cc2: Fix show original
nicolasroard [Sat, 14 Sep 2013 03:39:56 +0000 (20:39 -0700)]
am b10427af: am 2208eae6: am e30a1cc2: Fix show original

* commit 'b10427afd2925e369aef1b541c96e968aeb99a63':
  Fix show original

10 years agoam a6f544ae: am a085f59b: Merge "removed spinner stuck on screen behind image" into...
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

10 years agoam 2208eae6: am e30a1cc2: Fix show original
nicolasroard [Sat, 14 Sep 2013 03:37:59 +0000 (20:37 -0700)]
am 2208eae6: am e30a1cc2: Fix show original

* commit '2208eae6471c89b0c36a983b8f8d165e05904cbb':
  Fix show original

10 years agoam a085f59b: Merge "removed spinner stuck on screen behind image" into gb-ub-photos...
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

10 years agoam e30a1cc2: Fix show original
nicolasroard [Sat, 14 Sep 2013 03:36:19 +0000 (20:36 -0700)]
am e30a1cc2: Fix show original

* commit 'e30a1cc28e6724d54ba5b20e73d303e734c05559':
  Fix show original

10 years agoMerge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
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

10 years agoremoved spinner stuck on screen behind image
John Hoford [Fri, 13 Sep 2013 23:02:09 +0000 (16:02 -0700)]
removed spinner stuck on screen behind image

Change-Id: I71b2743147244c0fbfe352979c84677ac8ef3fb6

10 years agoFix show original
nicolasroard [Sat, 14 Sep 2013 00:24:11 +0000 (17:24 -0700)]
Fix show original

Change-Id: Ie3ed508c6a60a06f3bc33fb1b017be219a4c2044

10 years agoam bbd867a0: am 4f05d51f: am edf4b095: Fix various UX bugs
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

10 years agoam 813df7cf: am 74e981f3: am bae1c102: remove an Icon change that introduced a bug
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

10 years agoam 4f05d51f: am edf4b095: Fix various UX bugs
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

10 years agoam edf4b095: 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

10 years agoam 74e981f3: am bae1c102: remove an Icon change that introduced a bug
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

10 years agoFix 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

10 years agoam bae1c102: remove an Icon change that introduced a bug
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

10 years agoremove 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

10 years agoam 75d70625: am 2187c9c5: am b55bfb6e: fix crashes in in gallery by reversing previous cl
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

10 years agoam 2187c9c5: am b55bfb6e: 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

10 years agoam b55bfb6e: 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

10 years agofix 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

10 years agoDO NOT MERGE Cherry-pick:Update Gallery due to API change.
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

10 years agoam e762cca7: am 18277855: am bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
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

10 years agoam 18277855: am bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
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

10 years agoam bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbad
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

10 years agoMerge "Draw UI fixes" into gb-ub-photos-carlsbad
John Hoford [Fri, 13 Sep 2013 05:08:22 +0000 (05:08 +0000)]
Merge "Draw UI fixes" into gb-ub-photos-carlsbad

10 years agoam ea08f4a8: am b6f868b5: Merge "Update Gallery due to API change." into klp-dev
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.

10 years agoam 0b7454cf: am 5db6307d: am 7fa373b0: Fix pipeline overstress
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

10 years agoam 7343f946: am 004fcfc7: am 8e2a41b7: Merge "Fix triangle indicator" into gb-ub...
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

10 years agoam b6f868b5: Merge "Update Gallery due to API change." into klp-dev
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.

10 years agoam 5db6307d: am 7fa373b0: Fix pipeline overstress
nicolasroard [Fri, 13 Sep 2013 04:37:28 +0000 (21:37 -0700)]
am 5db6307d: am 7fa373b0: Fix pipeline overstress

* commit '5db6307de500d7774626713e76b559afd94b1096':
  Fix pipeline overstress

10 years agoam 004fcfc7: am 8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
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

10 years agoDraw UI fixes
John Hoford [Thu, 12 Sep 2013 14:49:24 +0000 (07:49 -0700)]
Draw UI fixes

bug:10705772
Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743

10 years agoMerge "Update Gallery due to API change." into klp-dev
Svetoslav [Fri, 13 Sep 2013 01:44:49 +0000 (01:44 +0000)]
Merge "Update Gallery due to API change." into klp-dev

10 years agoam 7fa373b0: Fix pipeline overstress
nicolasroard [Fri, 13 Sep 2013 01:04:46 +0000 (18:04 -0700)]
am 7fa373b0: Fix pipeline overstress

* commit '7fa373b0c3143c2c55a0d72487607d5a05c72e1d':
  Fix pipeline overstress

10 years agoUpdate Gallery due to API change.
Svetoslav [Fri, 13 Sep 2013 00:04:30 +0000 (17:04 -0700)]
Update Gallery due to API change.

Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8

10 years agoam b18de47f: am 39a155c7: am fcf74f8d: Merge "Enable virtualization" into gb-ub-photo...
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

10 years agoam 1844b200: am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb...
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

10 years agoam 8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
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

10 years agoFix pipeline overstress
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

10 years agoMerge "Fix triangle indicator" into gb-ub-photos-carlsbad
nicolasroard [Thu, 12 Sep 2013 23:01:33 +0000 (23:01 +0000)]
Merge "Fix triangle indicator" into gb-ub-photos-carlsbad

10 years agoFix triangle indicator
nicolasroard [Thu, 12 Sep 2013 22:01:09 +0000 (15:01 -0700)]
Fix triangle indicator

bug:10705772

Change-Id: Ib79f9894c57c77c12f8364fc689638a0aad582e6

10 years agoam 39a155c7: am fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbad
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

10 years agoam 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
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

10 years agoam fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbad
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

10 years agoMerge "Enable virtualization" into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 12 Sep 2013 21:25:54 +0000 (21:25 +0000)]
Merge "Enable virtualization" into gb-ub-photos-carlsbad

10 years agoam eb6a9b9c: Merge "fix Edit from filmstrip bug" 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

10 years agoMerge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
John Hoford [Thu, 12 Sep 2013 21:21:55 +0000 (21:21 +0000)]
Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad

10 years agofix Edit from filmstrip bug
John Hoford [Thu, 12 Sep 2013 21:16:50 +0000 (14:16 -0700)]
fix Edit from filmstrip bug

bug:10707676
Change-Id: Idb27d36713782237a66ee2e06cafb603dc107fb4

10 years agoEnable virtualization
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)

10 years agoam bef57819: am cdc5ceac: am e10fd688: Fix constrained zoom
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

10 years agoam cdc5ceac: am e10fd688: 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

10 years agoam e10fd688: 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

10 years agoFix constrained zoom
nicolasroard [Thu, 12 Sep 2013 17:26:57 +0000 (10:26 -0700)]
Fix constrained zoom

Change-Id: I3613ba23154897e9b7c1677ec9911453b5f73c0f

10 years agoam 3c2cdb00: am cf360646: am 34e84323: Fix full-res geometry
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

10 years agoam e9800eb6: am 09b825b1: am 5d727d85: Merge "Fix straighten tool" into gb-ub-photos...
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

10 years agoam 3ad349a5: am 7a3df681: am 3f9e5504: Merge "Replace add preset icon" into gb-ub...
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

10 years agoam 67af05e6: am a96ba88e: am b08324d5: Merge "Add custom border text" into gb-ub...
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

10 years agoam a975b198: am 738602a7: am 2d933002: Merge "Fix info panel" into gb-ub-photos-carlsbad
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

10 years agoam cf360646: am 34e84323: Fix full-res geometry
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