OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoam 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:49:40 +0000 (16:49 -0700)]
am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '627164c5d02c33c8a4224d34d0cabcd5c19951a0':
  Fix tablet UI layout

10 years agoam 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:47:59 +0000 (16:47 -0700)]
am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '9977d45fcae932581c1788cf3fa96a3f4040a8dc':
  Fix tablet UI layout

10 years agoam 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos...
John Hoford [Tue, 13 Aug 2013 23:46:07 +0000 (16:46 -0700)]
am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit '68b65c983e31b7a9923abb2eed5e8d736ddf7425':
  fix draw size and style display

10 years agoMerge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:45:17 +0000 (23:45 +0000)]
Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

10 years agoam dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 23:40:51 +0000 (16:40 -0700)]
am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit 'dbc7f5878da3038fbe96609ad21b5324e9645367':
  fix draw size and style display

10 years agoMerge "fix draw size and style display" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 23:38:08 +0000 (23:38 +0000)]
Merge "fix draw size and style display" into gb-ub-photos-carlsbad

10 years agoFix tablet UI layout
nicolasroard [Tue, 13 Aug 2013 23:29:11 +0000 (16:29 -0700)]
Fix tablet UI layout

Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f

10 years agofix draw size and style display
John Hoford [Tue, 13 Aug 2013 21:00:58 +0000 (14:00 -0700)]
fix draw size and style display

Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a

10 years agoam 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 21:03:13 +0000 (14:03 -0700)]
am 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery

* commit '0581bac494204a2dd5f246872d14691d562faa4b':
  Remove old video camera icon and label from Gallery

10 years agoam 389e8c88: Remove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 21:00:21 +0000 (14:00 -0700)]
am 389e8c88: Remove old video camera icon and label from Gallery

* commit '389e8c887489db88e9324c17e8d29363198e7221':
  Remove old video camera icon and label from Gallery

10 years agoRemove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 19:32:19 +0000 (12:32 -0700)]
Remove old video camera icon and label from Gallery

Bug: 10296343
Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e

10 years agoam 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub...
nicolasroard [Tue, 13 Aug 2013 17:46:01 +0000 (10:46 -0700)]
am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit '9ad51bd2f4ad081b00281d51e257352bf9378147':
  Fix icons rendering to be consistent

10 years agoam c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 17:39:56 +0000 (10:39 -0700)]
am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit 'c41fdd6f37df5dbd7f44b1c79cdd6d025937209d':
  Fix icons rendering to be consistent

10 years agoMerge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 17:38:12 +0000 (17:38 +0000)]
Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

10 years agoFix icons rendering to be consistent
nicolasroard [Tue, 13 Aug 2013 17:30:06 +0000 (10:30 -0700)]
Fix icons rendering to be consistent

Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e

10 years agoam c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:14:55 +0000 (09:14 -0700)]
am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0':
  add circle brush

10 years agoam 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:12:33 +0000 (09:12 -0700)]
am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419':
  add circle brush

10 years agoMerge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:09:29 +0000 (16:09 +0000)]
Merge "add circle brush" into gb-ub-photos-carlsbad

10 years agoam 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining...
Stephen Hines [Tue, 13 Aug 2013 04:51:33 +0000 (21:51 -0700)]
am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '4c89ec75151c28a905602b79f125583eba6edcd5':
  DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

10 years agoam 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LI...
Stephen Hines [Tue, 13 Aug 2013 04:49:45 +0000 (21:49 -0700)]
am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '1b02bf1271af9d0f90e07ef2dd57fffd246f3b37':
  DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

10 years agoDO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
Stephen Hines [Tue, 13 Aug 2013 03:50:55 +0000 (20:50 -0700)]
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218

10 years agoam 366c2ed3: Remove the unused libcutils.
Ying Wang [Tue, 13 Aug 2013 04:05:06 +0000 (21:05 -0700)]
am 366c2ed3: Remove the unused libcutils.

* commit '366c2ed307e91ad1fa22554cff3a95c50c12402e':
  Remove the unused libcutils.

10 years agoRemove the unused libcutils.
Ying Wang [Tue, 13 Aug 2013 03:51:28 +0000 (20:51 -0700)]
Remove the unused libcutils.

Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499

10 years agoam c20802f0: Remove all the tests from Gallery2 until we have them sorted out.
Sascha Haeberling [Tue, 13 Aug 2013 02:34:15 +0000 (19:34 -0700)]
am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.

* commit 'c20802f0342125eea7d50cb313678faf5e16ca0e':
  Remove all the tests from Gallery2 until we have them sorted out.

10 years agoRemove all the tests from Gallery2 until we have them sorted out.
Sascha Haeberling [Tue, 13 Aug 2013 02:19:32 +0000 (19:19 -0700)]
Remove all the tests from Gallery2 until we have them sorted out.

Change-Id: I72e3f0ce477f0b0d5bca1f53feba21b6aa77e315

10 years agoMerge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp
Qiwen Zhao [Tue, 13 Aug 2013 01:13:13 +0000 (18:13 -0700)]
Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp

10 years agoam 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010
Bart Sears [Tue, 13 Aug 2013 01:11:19 +0000 (18:11 -0700)]
am 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010

* commit '95599b519feaa601acfcefa2fa2183610bf87ce7':

10 years agoam 813b3fcc: am 5744809c: am 93ef658b: Add a direct rendering mode
nicolasroard [Tue, 13 Aug 2013 01:11:18 +0000 (18:11 -0700)]
am 813b3fcc: am 5744809c: am 93ef658b: Add a direct rendering mode

* commit '813b3fccb5377d1f132d22a312be4b4c5a49ea23':

10 years agoam 86dcd3b5: am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu...
Michael Kolb [Tue, 13 Aug 2013 01:11:16 +0000 (18:11 -0700)]
am 86dcd3b5: am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

* commit '86dcd3b596d3ac85c81c19632ce788f7389ab469':

10 years agoam a7794263: am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub...
Michael Kolb [Tue, 13 Aug 2013 01:11:15 +0000 (18:11 -0700)]
am a7794263: am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit 'a77942630ca7f3b0ea472f9806390977809e4e03':

10 years agoam 1e22d9bd: am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into...
Doris Liu [Tue, 13 Aug 2013 01:11:13 +0000 (18:11 -0700)]
am 1e22d9bd: am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit '1e22d9bdda7285053ac0b57d43cef041575cc94f':

10 years agoam a6ff1663: am f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Tue, 13 Aug 2013 01:11:12 +0000 (18:11 -0700)]
am a6ff1663: am f007ac89: am 6cfb081c: G+ crop overlay shadows.  Aspect ratios.

* commit 'a6ff1663887e0e6e9fc3a60b51415f6f7873f2fe':

10 years agoam 73bfca6f: am e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen...
Bobby Georgescu [Tue, 13 Aug 2013 01:11:10 +0000 (18:11 -0700)]
am 73bfca6f: am e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit '73bfca6f82745ff3a52f7ac03faa734b9f5d6860':

10 years agoam a9187510: am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub...
Angus Kong [Tue, 13 Aug 2013 01:11:09 +0000 (18:11 -0700)]
am a9187510: am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'a9187510448d4e5d2239ed06c137aa2d3cc0a096':

10 years agoam a0ee88a4: am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider...
George Mount [Tue, 13 Aug 2013 01:11:08 +0000 (18:11 -0700)]
am a0ee88a4: am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit 'a0ee88a40a618a514d99429d04146b64a264e3ad':

10 years agoam 4f087b99: am 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.
Ruben Brunk [Tue, 13 Aug 2013 01:11:06 +0000 (18:11 -0700)]
am 4f087b99: am 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit '4f087b99b8a3ab50aea097896910ca897047c62d':

10 years agoam f141351d: am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished"...
Doris Liu [Tue, 13 Aug 2013 01:11:05 +0000 (18:11 -0700)]
am f141351d: am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit 'f141351d0008e885889e28f9773b6ba65c1951ee':

10 years agoam 9fbc12ee: am 89127bbe: am 41185c4f: Fix downsampling check in crop.
Ruben Brunk [Tue, 13 Aug 2013 01:11:03 +0000 (18:11 -0700)]
am 9fbc12ee: am 89127bbe: am 41185c4f: Fix downsampling check in crop.

* commit '9fbc12ee45b31218bfdcc6d524d4515f1f17c537':

10 years agoam 4c629168: (-s ours) am ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import...
Baligh Uddin [Tue, 13 Aug 2013 01:11:02 +0000 (18:11 -0700)]
am 4c629168: (-s ours) am ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4c629168e7a967032172b7135631a85c49fddbf6':

10 years agoam d2021a3a: (-s ours) am a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import...
Baligh Uddin [Tue, 13 Aug 2013 01:11:00 +0000 (18:11 -0700)]
am d2021a3a: (-s ours) am a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'd2021a3abd12133c63171ea336e83aefea409465':

10 years agoadd circle brush
John Hoford [Tue, 13 Aug 2013 00:25:02 +0000 (17:25 -0700)]
add circle brush

Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d

10 years agoMerge remote-tracking branch 'origin/klp-dev' into klp-dev
Qiwen Zhao [Tue, 13 Aug 2013 00:16:57 +0000 (17:16 -0700)]
Merge remote-tracking branch 'origin/klp-dev' into klp-dev

10 years agoam 77306b68: am 4772792d: Bump up the version number to 1.1.40010
Bart Sears [Mon, 12 Aug 2013 23:51:26 +0000 (16:51 -0700)]
am 77306b68: am 4772792d: Bump up the version number to 1.1.40010

* commit '77306b68f36f73ff1820efce55bbf901d2636790':

10 years agoam 5744809c: am 93ef658b: Add a direct rendering mode
nicolasroard [Mon, 12 Aug 2013 23:51:25 +0000 (16:51 -0700)]
am 5744809c: am 93ef658b: Add a direct rendering mode

* commit '5744809cab0566ffc4a92add3bbe8493f16dd4ae':

10 years agoam 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub...
Michael Kolb [Mon, 12 Aug 2013 23:51:23 +0000 (16:51 -0700)]
am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

* commit '3019162b991edf67122885988d6cdf304a4c2dc9':

10 years agoam 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
Michael Kolb [Mon, 12 Aug 2013 23:51:21 +0000 (16:51 -0700)]
am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit '0553910ded3c386c151c29a4f6737b74d75e0284':

10 years agoam edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos...
Doris Liu [Mon, 12 Aug 2013 23:51:19 +0000 (16:51 -0700)]
am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit 'edddcab24d1443fb1a4deccfd2d8ddff5e0dcd8d':

10 years agoam f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Mon, 12 Aug 2013 23:51:17 +0000 (16:51 -0700)]
am f007ac89: am 6cfb081c: G+ crop overlay shadows.  Aspect ratios.

* commit 'f007ac8938b401d2d780677a3f6da593d3ddd923':

10 years agoam e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen importer view...
Bobby Georgescu [Mon, 12 Aug 2013 23:51:16 +0000 (16:51 -0700)]
am e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'e66f4abad0301965351a9c8d02f0d23449b03754':

10 years agoam 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
Angus Kong [Mon, 12 Aug 2013 23:51:14 +0000 (16:51 -0700)]
am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '115e86934c8e5b0be4b24d9e9ad9278425940838':

10 years agoam 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help perform...
George Mount [Mon, 12 Aug 2013 23:51:12 +0000 (16:51 -0700)]
am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '0e4ba348606517ce2bfa98e8e9b684f60bf5c36b':

10 years agoam 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.
Ruben Brunk [Mon, 12 Aug 2013 23:51:10 +0000 (16:51 -0700)]
am 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit '207b436c9dd7e09cb8f4fe7709140ffd8967a682':

10 years agoam 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos...
Doris Liu [Mon, 12 Aug 2013 23:51:08 +0000 (16:51 -0700)]
am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '5875c082565cbaa84a6fe1ad7ccbd7ef54a27eec':

10 years agoam 89127bbe: am 41185c4f: Fix downsampling check in crop.
Ruben Brunk [Mon, 12 Aug 2013 23:51:07 +0000 (16:51 -0700)]
am 89127bbe: am 41185c4f: Fix downsampling check in crop.

* commit '89127bbeb7febc9dfbc678093994bc80a22ec7aa':

10 years agoam ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 12 Aug 2013 23:51:05 +0000 (16:51 -0700)]
am ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'ee3b727ab8aaabded1c9a34a0539b3fe11a57f3a':

10 years agoam a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 12 Aug 2013 23:51:03 +0000 (16:51 -0700)]
am a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'a5d4147fbe63e6383df40da7c532cf5f02aab1d6':

10 years agoMerge "fix serialization on draw" into gb-ub-photos-carlsbad
John Hoford [Mon, 12 Aug 2013 22:34:52 +0000 (22:34 +0000)]
Merge "fix serialization on draw" into gb-ub-photos-carlsbad

10 years agofix serialization on draw
John Hoford [Mon, 12 Aug 2013 22:19:20 +0000 (15:19 -0700)]
fix serialization on draw

Change-Id: Id99acdb9ac6d65e0c8239ef6737f6e6a7fe5c04b

10 years agoRemove red eye tool
nicolasroard [Mon, 12 Aug 2013 21:26:50 +0000 (14:26 -0700)]
Remove red eye tool

Change-Id: I3ec169bc6b0948d3218a2e3457475ba57ea2f4c7

10 years agoMakes rotate and mirror direct operations
nicolasroard [Mon, 12 Aug 2013 21:04:11 +0000 (14:04 -0700)]
Makes rotate and mirror direct operations

Change-Id: I10128c211ec6e269603e3b3f3cbafadbeabdaac5

10 years agoFix for wrong bitmap picked after geometry change
nicolasroard [Mon, 12 Aug 2013 16:25:44 +0000 (09:25 -0700)]
Fix for wrong bitmap picked after geometry change

Change-Id: I48d7892c761bb1d8a83553786367aa11d1841fb5

10 years agoFix export dialog (size export)
nicolasroard [Sun, 11 Aug 2013 20:55:29 +0000 (13:55 -0700)]
Fix export dialog (size export)

Change-Id: Ifa4bb6a990622bfc00f6b4fe4998417fec32e650

10 years agoFix crash when we can't load the exif
nicolasroard [Sun, 11 Aug 2013 00:33:59 +0000 (17:33 -0700)]
Fix crash when we can't load the exif

Change-Id: I014518f727128676e9189d19c9e1073daeb2ee4b

10 years agoFix crash and missing content
nicolasroard [Sun, 11 Aug 2013 00:23:38 +0000 (17:23 -0700)]
Fix crash and missing content

Change-Id: I477599491921fc4319834f32d5806cdc165679e6

10 years agofix draw part 2
John Hoford [Mon, 5 Aug 2013 22:07:14 +0000 (15:07 -0700)]
fix draw part 2

Change-Id: Ib508cf5fd75403e5a36168255bf3613526436428

10 years agoMerge "fix draw" into gb-ub-photos-carlsbad
John Hoford [Sat, 10 Aug 2013 00:44:01 +0000 (00:44 +0000)]
Merge "fix draw" into gb-ub-photos-carlsbad

10 years agofix draw
John Hoford [Mon, 5 Aug 2013 22:07:14 +0000 (15:07 -0700)]
fix draw

Change-Id: I535221edd992c1a8c659c398dba61158e0c1d87d

10 years agoFix histogram view
nicolasroard [Fri, 9 Aug 2013 20:56:35 +0000 (13:56 -0700)]
Fix histogram view

Change-Id: Ic0c3a1103f5fa1f0ef1e72ae92fecfcb343bad74

10 years agoMerge "Add shadow" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 20:48:26 +0000 (20:48 +0000)]
Merge "Add shadow" into gb-ub-photos-carlsbad

10 years agoAdd shadow
nicolasroard [Fri, 9 Aug 2013 20:16:10 +0000 (13:16 -0700)]
Add shadow

Change-Id: Iba10c5d01bad8f0f49986150b2b4f6cf905be3cb

10 years agoMerge "Sync latest TiledImageView" into gb-ub-photos-carlsbad
John Reck [Fri, 9 Aug 2013 16:50:06 +0000 (16:50 +0000)]
Merge "Sync latest TiledImageView" into gb-ub-photos-carlsbad

10 years agoMerge "Add version category Fix bugs when loading Add info panel" into gb-ub-photos...
nicolasroard [Fri, 9 Aug 2013 14:09:56 +0000 (14:09 +0000)]
Merge "Add version category Fix bugs when loading Add info panel" into gb-ub-photos-carlsbad

10 years agoAdd version category
nicolasroard [Fri, 9 Aug 2013 03:47:28 +0000 (20:47 -0700)]
Add version category
Fix bugs when loading
Add info panel

Change-Id: I28966f2419b902405bc60e9cc927b109777a6a2d

10 years agoRemove Camera from Gallery2.
Sascha Haeberling [Thu, 8 Aug 2013 18:27:09 +0000 (11:27 -0700)]
Remove Camera from Gallery2.

Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590

10 years agoSync latest TiledImageView
John Reck [Thu, 8 Aug 2013 21:16:24 +0000 (14:16 -0700)]
Sync latest TiledImageView

Change-Id: I57e040a05e0ae4c1886eda014f1e6bf750612a3e

10 years agoMerge "WAR the crash from re-editing missing online image" into gb-ub-photos-carlsbad
ztenghui [Wed, 7 Aug 2013 23:33:32 +0000 (23:33 +0000)]
Merge "WAR the crash from re-editing missing online image" into gb-ub-photos-carlsbad

10 years agoFix full res zoom
nicolasroard [Thu, 1 Aug 2013 23:22:30 +0000 (16:22 -0700)]
Fix full res zoom
Also add filters merging in the cache.

Change-Id: Ic34c918b732159f3703cd83d30de907fdbbcb451

10 years agoMerge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 18:00:46 +0000 (18:00 +0000)]
Merge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad

10 years agoMerge "Remove MediaCache and MediaCacheUtils." into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 18:00:14 +0000 (18:00 +0000)]
Merge "Remove MediaCache and MediaCacheUtils." into gb-ub-photos-carlsbad

10 years agoMerge "Remove BitmapDecoder, which is now unused." into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 17:59:46 +0000 (17:59 +0000)]
Merge "Remove BitmapDecoder, which is now unused." into gb-ub-photos-carlsbad

10 years agoMove PanoramaViewHelper out of LightCycleHelper
George Mount [Tue, 6 Aug 2013 23:07:17 +0000 (16:07 -0700)]
Move PanoramaViewHelper out of LightCycleHelper

PanoramaViewHelper can be used outside of LightCycle panorama
picture creation.

Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f

10 years agoFix crash on camera startup
Doris Liu [Wed, 7 Aug 2013 00:29:30 +0000 (17:29 -0700)]
Fix crash on camera startup

Change-Id: Ic4f91d32d5ee4a01c2c406d1592aa0705db413ea

10 years agoRemove MediaCache and MediaCacheUtils.
George Mount [Tue, 6 Aug 2013 20:39:38 +0000 (13:39 -0700)]
Remove MediaCache and MediaCacheUtils.

Change-Id: Iebf4b10ecde56bc490a1b5a4add31a1cf766e9c9

10 years agoRemove BitmapDecoder, which is now unused.
George Mount [Tue, 6 Aug 2013 19:58:58 +0000 (12:58 -0700)]
Remove BitmapDecoder, which is now unused.

Change-Id: I01938fac23f212021bc9b7ebe649f40b7dae372a

10 years agoMerge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbad
Angus Kong [Tue, 6 Aug 2013 19:51:37 +0000 (19:51 +0000)]
Merge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbad

10 years agoMerge "Show newly recorded video." into gb-ub-photos-carlsbad
Angus Kong [Tue, 6 Aug 2013 19:40:20 +0000 (19:40 +0000)]
Merge "Show newly recorded video." into gb-ub-photos-carlsbad

10 years agoShow newly recorded video.
Angus Kong [Wed, 31 Jul 2013 22:36:33 +0000 (15:36 -0700)]
Show newly recorded video.

  bug:10115177

Change-Id: I5f9687b358e43e2e98f7b24a03dc8a17cc772433

10 years agoMerge "Implement capture animation" into gb-ub-photos-carlsbad
Doris Liu [Tue, 6 Aug 2013 18:15:55 +0000 (18:15 +0000)]
Merge "Implement capture animation" into gb-ub-photos-carlsbad

10 years agoShow PhotoSphere stitching progress.
Angus Kong [Wed, 31 Jul 2013 21:38:22 +0000 (14:38 -0700)]
Show PhotoSphere stitching progress.

Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37

10 years agoImplement capture animation
Doris Liu [Mon, 24 Jun 2013 18:30:24 +0000 (11:30 -0700)]
Implement capture animation

Also fix the thumb view by using real jpeg data rather than a preview frame
Bug: 10074619
Change-Id: Ie38884b30977c350b2ca0e0671bd9f5b10d3681e

10 years agoLoad the FilmStrip data in onCreate()
Angus Kong [Mon, 5 Aug 2013 22:30:05 +0000 (15:30 -0700)]
Load the FilmStrip data in onCreate()

The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.

bug:10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a

10 years agoMerge "Clean up the test tags used by the continuous test service to determine which...
Jason Noguchi [Sat, 3 Aug 2013 00:17:06 +0000 (00:17 +0000)]
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad

10 years agoClean up the test tags used by the continuous test service to determine which
Jason Noguchi [Wed, 31 Jul 2013 21:16:31 +0000 (14:16 -0700)]
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit
tests that are currently being skipped and remove LargeTest tags from long
running stress tests which are not necessary in this context.

Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87

10 years agoFix display bug with highres
nicolasroard [Fri, 2 Aug 2013 18:35:32 +0000 (11:35 -0700)]
Fix display bug with highres

Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed

10 years agoAdd quality selector to export.
Ruben Brunk [Fri, 2 Aug 2013 02:05:18 +0000 (19:05 -0700)]
Add quality selector to export.

- Adds the option to change the quality of the jpeg compression
  when flattening an exported bitmap.

Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4

10 years agoHide "View Photo Sphere" button by default.
Sascha Haeberling [Fri, 2 Aug 2013 00:55:49 +0000 (17:55 -0700)]
Hide "View Photo Sphere" button by default.

Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345

10 years agoMerge "add Per Channel Saturation" into gb-ub-photos-carlsbad
John Hoford [Fri, 2 Aug 2013 00:49:20 +0000 (00:49 +0000)]
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad

10 years agoAdd LocalDataAdapter and wrappers.
Angus Kong [Tue, 30 Jul 2013 18:36:00 +0000 (11:36 -0700)]
Add LocalDataAdapter and wrappers.

1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
  - onFullScreen()
  - canSwipeInFullScreen()
  - getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
  - onDataCentered()
  - onDataFullScreen()

Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427

10 years agoadd Per Channel Saturation
John Hoford [Tue, 30 Jul 2013 21:40:18 +0000 (14:40 -0700)]
add Per Channel Saturation

Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037

10 years agoMerge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 1 Aug 2013 22:50:52 +0000 (22:50 +0000)]
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad