OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed...
Doris Liu [Thu, 28 Mar 2013 16:54:02 +0000 (09:54 -0700)]
am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

* commit '30edf57559cd46e7cdb191a61fd2138bf6ead905':
  Disable preview gestures when shutter is pressed

11 years agoam 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub...
Doris Liu [Thu, 28 Mar 2013 16:52:25 +0000 (09:52 -0700)]
am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

* commit '10bd1e0c43b39ad3314a213822403588141cc7f5':
  Disable preview gestures when shutter is pressed

11 years agoMerge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
Doris Liu [Thu, 28 Mar 2013 16:50:07 +0000 (16:50 +0000)]
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

11 years agoam 0fe505ec: am 560f959b: Fix deadlock.
nicolasroard [Thu, 28 Mar 2013 06:40:08 +0000 (23:40 -0700)]
am 0fe505ec: am 560f959b: Fix deadlock.

* commit '0fe505ec49f69dccf3ceb0a409e1acb55a9d9a03':
  Fix deadlock.

11 years agoam 560f959b: Fix deadlock.
nicolasroard [Thu, 28 Mar 2013 06:38:14 +0000 (23:38 -0700)]
am 560f959b: Fix deadlock.

* commit '560f959b659bb510a6ac9a92831534c5dfcf16be':
  Fix deadlock.

11 years agoFix deadlock.
nicolasroard [Thu, 28 Mar 2013 05:10:01 +0000 (22:10 -0700)]
Fix deadlock.

Move the RenderScript context and Resources to CachingPipeline.

bug:8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d

11 years agoam 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
Ruben Brunk [Thu, 28 Mar 2013 03:57:41 +0000 (20:57 -0700)]
am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

* commit '7a46da5f63f021f6675849fe7ba8b4fe54c9b3d5':
  Fixed renderscript crashes.

11 years agoam 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
Ruben Brunk [Thu, 28 Mar 2013 03:55:34 +0000 (20:55 -0700)]
am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

* commit '4a1caa577565fb64804706de3abf8917ba915a1f':
  Fixed renderscript crashes.

11 years agoMerge "Fixed renderscript crashes." into gb-ub-photos-bryce
Ruben Brunk [Thu, 28 Mar 2013 03:53:46 +0000 (03:53 +0000)]
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

11 years agoDisable preview gestures when shutter is pressed
Doris Liu [Thu, 28 Mar 2013 00:25:43 +0000 (17:25 -0700)]
Disable preview gestures when shutter is pressed

Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31

11 years agoam d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos...
Angus Kong [Wed, 27 Mar 2013 22:01:07 +0000 (15:01 -0700)]
am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit 'd216ea465e60d5e447fa2c32ff950bbb1e9d02a9':
  Make camera calls asynchronous

11 years agoam 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Wed, 27 Mar 2013 21:59:32 +0000 (14:59 -0700)]
am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit '759ef774229db788024b2da6cadefe06fd96cd96':
  Make camera calls asynchronous

11 years agoMerge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Wed, 27 Mar 2013 21:58:31 +0000 (21:58 +0000)]
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

11 years agoMake camera calls asynchronous
Angus Kong [Tue, 26 Mar 2013 06:11:43 +0000 (23:11 -0700)]
Make camera calls asynchronous

bug:8438047

Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101

11 years agoFixed renderscript crashes.
Ruben Brunk [Wed, 27 Mar 2013 18:19:23 +0000 (11:19 -0700)]
Fixed renderscript crashes.

Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323

createFilter() initializes a ton of parameters in the RenderScript
filters.  Using stale parameters from a previous call to createFilter()
causes segfaults.

Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf

11 years agoam 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS...
Doris Liu [Wed, 27 Mar 2013 18:13:34 +0000 (11:13 -0700)]
am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

* commit '3fa3adcea76a693d51ae29aed0edd283ff1706d3':
  Workaround for switcher popup being cut off on ICS

11 years agoam 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub...
Doris Liu [Wed, 27 Mar 2013 18:11:30 +0000 (11:11 -0700)]
am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

* commit '4520e5edf00761e8f90e023330d9a90f0de37e70':
  Workaround for switcher popup being cut off on ICS

11 years agoMerge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
Doris Liu [Wed, 27 Mar 2013 18:10:18 +0000 (18:10 +0000)]
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

11 years agoWorkaround for switcher popup being cut off on ICS
Doris Liu [Wed, 27 Mar 2013 17:52:50 +0000 (10:52 -0700)]
Workaround for switcher popup being cut off on ICS

Bug: 8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d

11 years agoam c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline...
nicolasroard [Wed, 27 Mar 2013 05:02:12 +0000 (22:02 -0700)]
am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

* commit 'c2bc7ba3b404ed7556e99e7f9cb50150e242dab1':
  Moves ownership of the environment to the pipeline

11 years agoam 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub...
nicolasroard [Wed, 27 Mar 2013 05:00:19 +0000 (22:00 -0700)]
am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

* commit '0629d70d6b03a84741050ac9f3add8db0adad9c6':
  Moves ownership of the environment to the pipeline

11 years agoMerge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
nicolasroard [Wed, 27 Mar 2013 04:58:13 +0000 (04:58 +0000)]
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

11 years agoMoves ownership of the environment to the pipeline
nicolasroard [Sat, 23 Mar 2013 05:02:37 +0000 (22:02 -0700)]
Moves ownership of the environment to the pipeline

Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec

11 years agoam e1073df5: am 53a06d0d: Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:04:10 +0000 (20:04 -0700)]
am e1073df5: am 53a06d0d: Remove debug log.

* commit 'e1073df5751cfd90c81ae30d97319d9b54513578':
  Remove debug log.

11 years agoam 53a06d0d: Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:02:33 +0000 (20:02 -0700)]
am 53a06d0d: Remove debug log.

* commit '53a06d0d76c7f59aa5678f9a8d72f211b3ace773':
  Remove debug log.

11 years agoRemove debug log.
Angus Kong [Wed, 27 Mar 2013 02:58:34 +0000 (19:58 -0700)]
Remove debug log.

Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43

11 years agoam 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:36:59 +0000 (17:36 -0700)]
am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.

* commit '4c11a2b6131e8c428451484375f372833c9aa7de':
  Add GPSDirection tag using ExifInterface.

11 years agoam dd2e511d: Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:34:54 +0000 (17:34 -0700)]
am dd2e511d: Add GPSDirection tag using ExifInterface.

* commit 'dd2e511d212ddc438760b23b8cdf5081daccc9ef':
  Add GPSDirection tag using ExifInterface.

11 years agoAdd GPSDirection tag using ExifInterface.
Angus Kong [Tue, 26 Mar 2013 18:40:40 +0000 (11:40 -0700)]
Add GPSDirection tag using ExifInterface.

bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 26 Mar 2013 12:56:10 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 91dd4e7b: am be31e587: Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:26:30 +0000 (05:26 +0000)]
am 91dd4e7b: am be31e587: Hides popup indicator on some editors

* commit '91dd4e7b12f32d72ab2f7baaf538a939ca7bfaeb':
  Hides popup indicator on some editors

11 years agoam be31e587: Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:24:44 +0000 (22:24 -0700)]
am be31e587: Hides popup indicator on some editors

* commit 'be31e587c1485fb8e3d7c8b079250ffbdc26e1b9':
  Hides popup indicator on some editors

11 years agoHides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 04:40:08 +0000 (21:40 -0700)]
Hides popup indicator on some editors

Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae

11 years agoam 4cdcd1d6: am 91be98c3: Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:33:38 +0000 (04:33 +0000)]
am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors

* commit '4cdcd1d611c31dc4535a124ab9e2a5f00e1dfa14':
  Hides seekbar in some editors

11 years agoam 91be98c3: Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:14:16 +0000 (21:14 -0700)]
am 91be98c3: Hides seekbar in some editors

* commit '91be98c35f6c5f19d7629bb29e7261970b2f4c67':
  Hides seekbar in some editors

11 years agoHides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:08:47 +0000 (21:08 -0700)]
Hides seekbar in some editors

Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c

11 years agoam 8c6e88ad: am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photo...
Doris Liu [Mon, 25 Mar 2013 23:55:21 +0000 (23:55 +0000)]
am 8c6e88ad: am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce

* commit '8c6e88add526e3e28beb04b4cba42e86db0d2bd7':
  Adding switcher background back in

11 years agoam 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce
Doris Liu [Mon, 25 Mar 2013 23:53:38 +0000 (16:53 -0700)]
am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce

* commit '0dd47d9e60cc94f30253a656ec893347160832de':
  Adding switcher background back in

11 years agoMerge "Adding switcher background back in" into gb-ub-photos-bryce
Doris Liu [Mon, 25 Mar 2013 23:52:40 +0000 (23:52 +0000)]
Merge "Adding switcher background back in" into gb-ub-photos-bryce

11 years agoAdding switcher background back in
Doris Liu [Mon, 25 Mar 2013 23:05:31 +0000 (16:05 -0700)]
Adding switcher background back in

Fixed switcher background's rotation issue.
Bug: 8436031

Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938

11 years agoam ed4bfae9: am b2a64665: Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:55:59 +0000 (22:55 +0000)]
am ed4bfae9: am b2a64665: Add album type to albums table.

* commit 'ed4bfae941dcc8ecc6112d3a313245bd3d057f76':
  Add album type to albums table.

11 years agoam b2a64665: Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:54:14 +0000 (15:54 -0700)]
am b2a64665: Add album type to albums table.

* commit 'b2a646658c87378b681d85a130db705a39d07171':
  Add album type to albums table.

11 years agoAdd album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]
Add album type to albums table.

Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 25 Mar 2013 12:56:35 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 8de91d71: am 05762614: Merge "Refactoring: removed unnecessary apply calls." into...
Ruben Brunk [Sat, 23 Mar 2013 04:54:15 +0000 (04:54 +0000)]
am 8de91d71: am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce

* commit '8de91d71647581203f5513c210798dc8ddf4a51f':
  Refactoring: removed unnecessary apply calls.

11 years agoam 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos...
Ruben Brunk [Sat, 23 Mar 2013 04:53:05 +0000 (21:53 -0700)]
am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce

* commit '05762614aa36d5b8b5ed7acd107360a1abc602e3':
  Refactoring: removed unnecessary apply calls.

11 years agoMerge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
Ruben Brunk [Sat, 23 Mar 2013 04:52:14 +0000 (04:52 +0000)]
Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce

11 years agoRefactoring: removed unnecessary apply calls.
Ruben Brunk [Sat, 23 Mar 2013 04:20:03 +0000 (21:20 -0700)]
Refactoring: removed unnecessary apply calls.

Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6

11 years agoam b06f92de: am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Sat, 23 Mar 2013 01:27:07 +0000 (01:27 +0000)]
am b06f92de: am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'b06f92de6901802c2b910097052ce88769268e9d':
  Import translations. DO NOT MERGE

11 years agoam 6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 23 Mar 2013 01:23:43 +0000 (01:23 +0000)]
am 6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '6c0410a3c497d67054512d518981efe3f76bb724':
  Import translations. DO NOT MERGE

11 years agoam 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sat, 23 Mar 2013 01:22:01 +0000 (18:22 -0700)]
am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2c88c2be6947321fbdab4a2bcd99c5eb204a4d71':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 23 Mar 2013 01:20:46 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Sat, 23 Mar 2013 01:20:27 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 1ca57b51: am 47657615: Bump up the version number to 1.1.40006
Bart Sears [Fri, 22 Mar 2013 22:05:20 +0000 (22:05 +0000)]
am 1ca57b51: am 47657615: Bump up the version number to 1.1.40006

* commit '1ca57b51268ff2c522b064829a239d2d89774849':
  Bump up the version number to 1.1.40006

11 years agoam 47657615: Bump up the version number to 1.1.40006
Bart Sears [Fri, 22 Mar 2013 22:02:54 +0000 (15:02 -0700)]
am 47657615: Bump up the version number to 1.1.40006

* commit '476576159c2ecbfaca99c696b5b46c56b30f3d19':
  Bump up the version number to 1.1.40006

11 years agoam 476385b2: am e5265447: Fix NPE in Camera
Michael Kolb [Fri, 22 Mar 2013 21:49:44 +0000 (21:49 +0000)]
am 476385b2: am e5265447: Fix NPE in Camera

* commit '476385b2a9ff26149ae15e5da9c2d502cb58809d':
  Fix NPE in Camera

11 years agoBump up the version number to 1.1.40006
Bart Sears [Fri, 22 Mar 2013 21:47:19 +0000 (14:47 -0700)]
Bump up the version number to 1.1.40006

Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c

11 years agoam e5265447: Fix NPE in Camera
Michael Kolb [Fri, 22 Mar 2013 21:44:39 +0000 (14:44 -0700)]
am e5265447: Fix NPE in Camera

* commit 'e5265447dddd9d48c4c78192bd21a6aba5588f9f':
  Fix NPE in Camera

11 years agoFix NPE in Camera
Michael Kolb [Fri, 22 Mar 2013 21:11:57 +0000 (14:11 -0700)]
Fix NPE in Camera

  Bug: 8409508

Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Mar 2013 19:00:59 +0000 (12:00 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Mar 2013 19:00:17 +0000 (12:00 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam d8651ca5: am f0c33e79: Add renderers only once
Michael Kolb [Fri, 22 Mar 2013 18:21:37 +0000 (18:21 +0000)]
am d8651ca5: am f0c33e79: Add renderers only once

* commit 'd8651ca54dafa74aea2d008c4044132083f7168d':
  Add renderers only once

11 years agoam f0c33e79: Add renderers only once
Michael Kolb [Fri, 22 Mar 2013 18:19:30 +0000 (11:19 -0700)]
am f0c33e79: Add renderers only once

* commit 'f0c33e7991f6778534e958551938db8d239957ba':
  Add renderers only once

11 years agoAdd renderers only once
Michael Kolb [Fri, 22 Mar 2013 17:56:12 +0000 (10:56 -0700)]
Add renderers only once

Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1

11 years agoam 5842f8e9: am 18027792: Fix problem applying the Fx filter Also adds some debug...
nicolasroard [Fri, 22 Mar 2013 06:37:25 +0000 (06:37 +0000)]
am 5842f8e9: am 18027792: Fix problem applying the Fx filter Also adds some debug info

* commit '5842f8e941898e8b48d15dd8f3e79fadc97268ef':
  Fix problem applying the Fx filter Also adds some debug info

11 years agoam 18027792: Fix problem applying the Fx filter Also adds some debug info
nicolasroard [Fri, 22 Mar 2013 06:35:37 +0000 (23:35 -0700)]
am 18027792: Fix problem applying the Fx filter Also adds some debug info

* commit '180277924bebf6b600ee5ce5adf9ff807a038570':
  Fix problem applying the Fx filter Also adds some debug info

11 years agoFix problem applying the Fx filter
nicolasroard [Fri, 22 Mar 2013 04:33:22 +0000 (21:33 -0700)]
Fix problem applying the Fx filter
Also adds some debug info

bug:8442036
Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5

11 years agoam 67eae7ff: am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce
John Reck [Fri, 22 Mar 2013 00:44:34 +0000 (00:44 +0000)]
am 67eae7ff: am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce

* commit '67eae7ff7d6a563b7321399a9a4b845a19858881':
  Revert "New loading model"

11 years agoam b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce
John Reck [Fri, 22 Mar 2013 00:40:24 +0000 (17:40 -0700)]
am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce

* commit 'b4e071b57e0cc3d07131a44cf55ad5e59538a342':
  Revert "New loading model"

11 years agoMerge "Revert "New loading model"" into gb-ub-photos-bryce
John Reck [Fri, 22 Mar 2013 00:38:52 +0000 (00:38 +0000)]
Merge "Revert "New loading model"" into gb-ub-photos-bryce

11 years agoam 2e05f3b8: am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb...
Bobby Georgescu [Thu, 21 Mar 2013 21:54:41 +0000 (21:54 +0000)]
am 2e05f3b8: am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce

* commit '2e05f3b85fdabec59910769760615b81cda2cc9c':
  Refactor grid fragments in new gallery

11 years agoam 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 21 Mar 2013 21:51:33 +0000 (14:51 -0700)]
am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce

* commit '1b88ac5351975d3373ff9014055962efe00ccc42':
  Refactor grid fragments in new gallery

11 years agoMerge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 21 Mar 2013 21:49:36 +0000 (21:49 +0000)]
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce

11 years agoRevert "New loading model"
John Reck [Thu, 21 Mar 2013 21:22:33 +0000 (14:22 -0700)]
Revert "New loading model"

Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed

11 years agoam 5889af45: am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
John Reck [Thu, 21 Mar 2013 20:04:46 +0000 (20:04 +0000)]
am 5889af45: am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce

* commit '5889af4525419e0addbc2aa3d8aac5c5752a2c63':
  Changes for CanvasProvider

11 years agoam d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
John Reck [Thu, 21 Mar 2013 20:02:49 +0000 (13:02 -0700)]
am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce

* commit 'd6db9403125261d46e410db60b8a25f1d9014d2b':
  Changes for CanvasProvider

11 years agoMerge "Changes for CanvasProvider" into gb-ub-photos-bryce
John Reck [Thu, 21 Mar 2013 20:01:12 +0000 (20:01 +0000)]
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 21 Mar 2013 12:55:56 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:10:33 +0000 (05:10 +0000)]
am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce

* commit '346995f05112e8fc8a37ecfcc6f4fa8bbe8f441f':
  Removing obsolete test.

11 years agoam 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:08:52 +0000 (22:08 -0700)]
am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce

* commit '8b65a2a7a415f80e54f993973661b4060e6384f5':
  Removing obsolete test.

11 years agoMerge "Removing obsolete test." into gb-ub-photos-bryce
Jason Noguchi [Thu, 21 Mar 2013 05:07:14 +0000 (05:07 +0000)]
Merge "Removing obsolete test." into gb-ub-photos-bryce

11 years agoam 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub...
Doris Liu [Thu, 21 Mar 2013 03:24:15 +0000 (03:24 +0000)]
am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit '4fee4e4cc97b7706a6c3bb9ee74034e9f249c5c4':
  Fix for record button not responding

11 years agoam a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Mar 2013 03:22:55 +0000 (20:22 -0700)]
am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit 'a088f92a1e18c64231da6b693bb541ace8d8f952':
  Fix for record button not responding

11 years agoMerge "Fix for record button not responding" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Mar 2013 03:21:18 +0000 (03:21 +0000)]
Merge "Fix for record button not responding" into gb-ub-photos-bryce

11 years agoam ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 03:01:26 +0000 (03:01 +0000)]
am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor

* commit 'ec16059f822d5701da5f716d0bdda5ee3fdfc43e':
  Don't show the original image in the Curves editor

11 years agoam 3024aa22: Don\'t show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 02:58:40 +0000 (19:58 -0700)]
am 3024aa22: Don\'t show the original image in the Curves editor

* commit '3024aa22d372c0d6608b143a0c46b86c2104f9b1':
  Don't show the original image in the Curves editor

11 years agoDon't show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 02:48:49 +0000 (19:48 -0700)]
Don't show the original image in the Curves editor

Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e

11 years agoam 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:51:24 +0000 (02:51 +0000)]
am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

* commit '6e3b080abd80a88c9dff8fd5d2904b3d7c5b7e31':
  Fix crashes with RS filters

11 years agoam d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:48:30 +0000 (19:48 -0700)]
am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

* commit 'd37039a9222b740b7c3f10626af91d2a351c89f3':
  Fix crashes with RS filters

11 years agoMerge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:46:52 +0000 (02:46 +0000)]
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

11 years agoFix crashes with RS filters
nicolasroard [Wed, 20 Mar 2013 21:55:48 +0000 (14:55 -0700)]
Fix crashes with RS filters

bug:8418537

Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365

11 years agoFix for record button not responding
Doris Liu [Thu, 21 Mar 2013 02:25:47 +0000 (19:25 -0700)]
Fix for record button not responding

Bug: 8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4

11 years agoam 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 01:48:39 +0000 (01:48 +0000)]
am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons.

* commit '7cf8eb3bb27f1e7bafcb3828c76a6bc3b8341ae5':
  Added accessability description for filter buttons.

11 years agoam 5455ac56: Added accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 01:46:10 +0000 (18:46 -0700)]
am 5455ac56: Added accessability description for filter buttons.

* commit '5455ac56cbde7505687cd885b62f7a9d03d826b2':
  Added accessability description for filter buttons.

11 years agoRemoving obsolete test.
Jason Noguchi [Thu, 21 Mar 2013 01:33:20 +0000 (18:33 -0700)]
Removing obsolete test.

Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c

11 years agoAdded accessability description for filter buttons.
Ruben Brunk [Thu, 21 Mar 2013 00:12:43 +0000 (17:12 -0700)]
Added accessability description for filter buttons.

Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae

11 years agoRefactor grid fragments in new gallery
Bobby Georgescu [Wed, 20 Mar 2013 22:34:44 +0000 (15:34 -0700)]
Refactor grid fragments in new gallery

Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22

11 years agoChanges for CanvasProvider
John Reck [Tue, 19 Mar 2013 18:43:37 +0000 (11:43 -0700)]
Changes for CanvasProvider

Change-Id: I0f90f08f4413717933083d110d5020f494d9ed5f

11 years agoam 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery...
Bobby Georgescu [Wed, 20 Mar 2013 21:14:41 +0000 (21:14 +0000)]
am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '5fac07357ce9a97000b4bb636445112aa1fa6171':
  Refactor fragment/activity coupling in new Gallery