OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
Michael Kolb [Tue, 16 Apr 2013 00:29:14 +0000 (17:29 -0700)]
am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce

* commit '0786c387413d434438257697475cf743661df296':
  Angle menu at edge of screen

11 years agoMerge "Angle menu at edge of screen" into gb-ub-photos-bryce
Michael Kolb [Tue, 16 Apr 2013 00:26:16 +0000 (00:26 +0000)]
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce

11 years agoAngle menu at edge of screen
Michael Kolb [Wed, 10 Apr 2013 21:16:19 +0000 (14:16 -0700)]
Angle menu at edge of screen

  Bug: 8618699

Adjust touch slices; adjust label position

Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3

11 years agoam f7771f98: Use extra copy of parameters for concurrent access
Angus Kong [Mon, 15 Apr 2013 22:33:42 +0000 (15:33 -0700)]
am f7771f98: Use extra copy of parameters for concurrent access

* commit 'f7771f98aed9f253048af7dd8b2a143b9258c139':
  Use extra copy of parameters for concurrent access

11 years agoUse extra copy of parameters for concurrent access
Angus Kong [Mon, 15 Apr 2013 19:11:15 +0000 (12:11 -0700)]
Use extra copy of parameters for concurrent access

bug:8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e

11 years agoam 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 20:30:02 +0000 (13:30 -0700)]
am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce

* commit '789918643e2b682e387435002b5b0c287f35b39b':
  Also, add labels to video menu

11 years agoMerge "Also, add labels to video menu" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 20:27:45 +0000 (20:27 +0000)]
Merge "Also, add labels to video menu" into gb-ub-photos-bryce

11 years agoAlso, add labels to video menu
Michael Kolb [Mon, 15 Apr 2013 20:17:27 +0000 (13:17 -0700)]
Also, add labels to video menu

  Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c

11 years agoam a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 15 Apr 2013 19:59:47 +0000 (12:59 -0700)]
am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 19:57:45 +0000 (19:57 +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 [Mon, 15 Apr 2013 19:57:35 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 19:42:39 +0000 (12:42 -0700)]
am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce

* commit 'ad30f960879285c4dadb10d5b7531e05c345587f':
  Add menu labels

11 years agoMerge "Add menu labels" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 19:40:32 +0000 (19:40 +0000)]
Merge "Add menu labels" into gb-ub-photos-bryce

11 years agoam 3dc6a630: Merge "Fix performance and other issues related to multi-selection"...
Bobby Georgescu [Mon, 15 Apr 2013 19:33:32 +0000 (12:33 -0700)]
am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce

* commit '3dc6a630aff5be323c54b4616fd3a373cbad31f7':
  Fix performance and other issues related to multi-selection

11 years agoMerge "Fix performance and other issues related to multi-selection" into gb-ub-photos...
Bobby Georgescu [Mon, 15 Apr 2013 19:30:02 +0000 (19:30 +0000)]
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce

11 years agoam d2f5fe60: support for simplified parameters in filter
John Hoford [Mon, 15 Apr 2013 18:48:13 +0000 (11:48 -0700)]
am d2f5fe60: support for simplified parameters in filter

* commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab':
  support for simplified parameters in filter

11 years agoAdd menu labels
Michael Kolb [Wed, 10 Apr 2013 15:50:51 +0000 (08:50 -0700)]
Add menu labels

  Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f

11 years agosupport for simplified parameters in filter
John Hoford [Wed, 10 Apr 2013 21:58:05 +0000 (14:58 -0700)]
support for simplified parameters in filter

Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 18:36:35 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 18:36:00 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 4b6ea5bc: Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 15:12:28 +0000 (08:12 -0700)]
am 4b6ea5bc: Add direct rendering for border

* commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44':
  Add direct rendering for border

11 years agoAdd direct rendering for border
nicolasroard [Sat, 13 Apr 2013 00:47:14 +0000 (17:47 -0700)]
Add direct rendering for border

bug:8603245

Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d

11 years agoFix performance and other issues related to multi-selection
Bobby Georgescu [Fri, 12 Apr 2013 22:11:39 +0000 (15:11 -0700)]
Fix performance and other issues related to multi-selection

Bug: 8606565
Bug: 8607510
Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2

11 years agoam b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 12 Apr 2013 23:38:03 +0000 (16:38 -0700)]
am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 12 Apr 2013 23:34:18 +0000 (23:34 +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 [Fri, 12 Apr 2013 23:34:05 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 4772792d: Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 21:28:00 +0000 (14:28 -0700)]
am 4772792d: Bump up the version number to 1.1.40010

* commit '4772792dbe4a29bd90139eead6a881f47523ede5':
  Bump up the version number to 1.1.40010

11 years agoBump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 20:48:58 +0000 (13:48 -0700)]
Bump up the version number to 1.1.40010

Bug: 8607157
Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765

11 years agoam 93ef658b: Add a direct rendering mode
nicolasroard [Fri, 12 Apr 2013 20:18:45 +0000 (13:18 -0700)]
am 93ef658b: Add a direct rendering mode

* commit '93ef658bf44d7ecd79894a9a225a400c2741058f':
  Add a direct rendering mode

11 years agoAdd a direct rendering mode
nicolasroard [Thu, 11 Apr 2013 02:27:57 +0000 (19:27 -0700)]
Add a direct rendering mode

This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.

bug:8603245
bug:8588853

Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 18:20:51 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 18:20:18 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

* commit 'bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
  Add checks for NPE in video pie menu.

11 years agoMerge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 17:00:38 +0000 (17:00 +0000)]
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

11 years agoam af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 16:54:18 +0000 (09:54 -0700)]
am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit 'af998215b46e2b0ffaa2a47a762ba78f7c522e60':
  Fix NPE in PieRenderer

11 years agoMerge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 16:51:57 +0000 (16:51 +0000)]
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

11 years agoam d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
Doris Liu [Fri, 12 Apr 2013 16:50:11 +0000 (09:50 -0700)]
am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit 'd8259c06a0ed459eb937cf3bd3ddd79db1ea2533':
  Fix ICS recording aspect ratio

11 years agoMerge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
Doris Liu [Fri, 12 Apr 2013 16:47:05 +0000 (16:47 +0000)]
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

11 years agoFix NPE in PieRenderer
Michael Kolb [Fri, 12 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Fix NPE in PieRenderer

  Bug: 8579025

Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574

11 years agoam 6cfb081c: G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 03:37:44 +0000 (20:37 -0700)]
am 6cfb081c: G+ crop overlay shadows.  Aspect ratios.

* commit '6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0':
  G+ crop overlay shadows.  Aspect ratios.

11 years agoG+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 01:01:25 +0000 (18:01 -0700)]
G+ crop overlay shadows.  Aspect ratios.

Bug: 8597538

Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909

11 years agoAdd checks for NPE in video pie menu.
Jason Noguchi [Fri, 12 Apr 2013 00:39:20 +0000 (17:39 -0700)]
Add checks for NPE in video pie menu.

Bug: 8536361

Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9

11 years agoFix ICS recording aspect ratio
Doris Liu [Wed, 10 Apr 2013 18:52:40 +0000 (11:52 -0700)]
Fix ICS recording aspect ratio

Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0

11 years agoam e51f236b: Merge "Show loading indicator in full-screen importer view" into gb...
Bobby Georgescu [Thu, 11 Apr 2013 22:56:11 +0000 (15:56 -0700)]
am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'e51f236bfcc617979871f0be7ce46691cf5415c8':
  Show loading indicator in full-screen importer view

11 years agoMerge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 11 Apr 2013 22:52:42 +0000 (22:52 +0000)]
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

11 years agoShow loading indicator in full-screen importer view
Bobby Georgescu [Thu, 11 Apr 2013 22:34:00 +0000 (15:34 -0700)]
Show loading indicator in full-screen importer view

Bug: 8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f

11 years agoam 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
Angus Kong [Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
  Integrate FilmStripView.

11 years agoMerge "Integrate FilmStripView." into gb-ub-photos-bryce
Angus Kong [Thu, 11 Apr 2013 22:42:12 +0000 (22:42 +0000)]
Merge "Integrate FilmStripView." into gb-ub-photos-bryce

11 years agoam 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All...
George Mount [Thu, 11 Apr 2013 20:54:37 +0000 (13:54 -0700)]
am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '34a50f0c3db6890e857abc68f5b9280f95c14d2e':
  Add _COUNT support for PhotoProvider to help performance of All Photos.

11 years agoMerge "Add _COUNT support for PhotoProvider to help performance of All Photos." into...
George Mount [Thu, 11 Apr 2013 20:52:32 +0000 (20:52 +0000)]
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

11 years agoam ea2fa83c: Setup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 20:27:18 +0000 (13:27 -0700)]
am ea2fa83c: Setup geometry xforms and propogation chain.

* commit 'ea2fa83c2dd2b59b8a67ec363e4ac431748f997b':
  Setup geometry xforms and propogation chain.

11 years agoSetup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 19:39:03 +0000 (12:39 -0700)]
Setup geometry xforms and propogation chain.

Bug: 8597538

Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388

11 years agoIntegrate FilmStripView.
Angus Kong [Tue, 9 Apr 2013 22:02:59 +0000 (15:02 -0700)]
Integrate FilmStripView.

Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d

11 years agoAdd _COUNT support for PhotoProvider to help performance of All Photos.
George Mount [Tue, 9 Apr 2013 20:45:09 +0000 (13:45 -0700)]
Add _COUNT support for PhotoProvider to help performance of All Photos.

 Bug 8594818

Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6

11 years agoam 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
Doris Liu [Thu, 11 Apr 2013 17:09:47 +0000 (10:09 -0700)]
am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '1f60d9cd60e01da716a736803994ce14016947ac':
  Fix camera preview being squished

11 years agoMerge "Fix camera preview being squished" into gb-ub-photos-bryce
Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]
Merge "Fix camera preview being squished" into gb-ub-photos-bryce

11 years agoam 41185c4f: Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 03:40:41 +0000 (20:40 -0700)]
am 41185c4f: Fix downsampling check in crop.

* commit '41185c4fdbccad17b79697306a7f8044b8f7ffd3':
  Fix downsampling check in crop.

11 years agoFix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.

Bug: 8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848

11 years agoFix camera preview being squished
Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]
Fix camera preview being squished

Bug: 8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd

11 years agoam 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 10 Apr 2013 19:59:22 +0000 (12:59 -0700)]
am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '27b9459f3764d45d46092aa541e691ff861e0aff':
  Import translations. DO NOT MERGE

11 years agoam ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 10 Apr 2013 19:59:21 +0000 (12:59 -0700)]
am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:58:23 +0000 (19:58 +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 [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +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 [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 10 Apr 2013 19:42:13 +0000 (12:42 -0700)]
am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

* commit '6b138c2240d35571e1f49258f84ec2659223d251':
  Correctly scale images in MTP importer

11 years agoMerge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 18:54:42 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 18:54:22 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 18:52:53 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Wed, 10 Apr 2013 18:52:51 +0000 (11:52 -0700)]
am b6b2d1c4: Merge "Adding simple crop ui.  Refactoring." into gb-ub-photos-bryce

* commit 'b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90':
  Adding simple crop ui.  Refactoring.

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 18:52:19 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE

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

11 years agoCorrectly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]
Correctly scale images in MTP importer

Bug: 8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4

11 years agoMerge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]
Merge "Adding simple crop ui.  Refactoring." into gb-ub-photos-bryce

11 years agoam 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos...
ztenghui [Wed, 10 Apr 2013 18:31:34 +0000 (11:31 -0700)]
am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce

* commit '3eb2fb4dd2ede7f65ee307061213f0e8860f15f6':
  Use MediaMuxer for the video trim and mute.

11 years agoMerge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
ztenghui [Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce

11 years agoUse MediaMuxer for the video trim and mute.
ztenghui [Mon, 8 Apr 2013 21:37:53 +0000 (14:37 -0700)]
Use MediaMuxer for the video trim and mute.

bug:8548085

Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0

11 years agoam 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub...
Angus Kong [Wed, 10 Apr 2013 17:39:18 +0000 (10:39 -0700)]
am 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce

* commit '2fc6641b80a7aedf54062cbd01c40cbf0764a6ca':
  Refactor CameraDataAdapter for other data types.

11 years agoMerge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
Angus Kong [Wed, 10 Apr 2013 17:35:58 +0000 (17:35 +0000)]
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce

11 years agoam 3bc806a8: Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 16:10:00 +0000 (09:10 -0700)]
am 3bc806a8: Small cleanup in setting resources

* commit '3bc806a8575072c9459fe3698675d3713300d1d3':
  Small cleanup in setting resources

11 years agoSmall cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 15:20:26 +0000 (08:20 -0700)]
Small cleanup in setting resources

Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad

11 years agoam e29b5733: Add a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 14:31:19 +0000 (07:31 -0700)]
am e29b5733: Add a third pipeline reserved for the high res preview

* commit 'e29b57330be471dd74672a7bdc74a93dcae3a98b':
  Add a third pipeline reserved for the high res preview

11 years agoAdding simple crop ui. Refactoring.
Ruben Brunk [Wed, 10 Apr 2013 07:11:46 +0000 (00:11 -0700)]
Adding simple crop ui.  Refactoring.

Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540

11 years agoAdd a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 01:43:31 +0000 (18:43 -0700)]
Add a third pipeline reserved for the high res preview

Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b

11 years agoRefactor CameraDataAdapter for other data types.
Angus Kong [Mon, 8 Apr 2013 23:57:57 +0000 (16:57 -0700)]
Refactor CameraDataAdapter for other data types.

Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4

11 years agoam 701955ac: Merge "support icon styles" into gb-ub-photos-bryce
John Hoford [Wed, 10 Apr 2013 01:21:56 +0000 (18:21 -0700)]
am 701955ac: Merge "support icon styles" into gb-ub-photos-bryce

* commit '701955ac93bb05bff2a826c79ea60f921b3745fc':
  support icon styles

11 years agoam 7668544e: Detach old editor
nicolasroard [Wed, 10 Apr 2013 01:21:55 +0000 (18:21 -0700)]
am 7668544e: Detach old editor

* commit '7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11':
  Detach old editor

11 years agoMerge "support icon styles" into gb-ub-photos-bryce
John Hoford [Wed, 10 Apr 2013 00:56:32 +0000 (00:56 +0000)]
Merge "support icon styles" into gb-ub-photos-bryce

11 years agoDetach old editor
nicolasroard [Wed, 10 Apr 2013 00:52:08 +0000 (17:52 -0700)]
Detach old editor

Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2

11 years agosupport icon styles
John Hoford [Wed, 10 Apr 2013 00:47:24 +0000 (17:47 -0700)]
support icon styles

Change-Id: I9a4af2826824fd519099363b3190fc417b67c022

11 years agoam 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 23:43:39 +0000 (16:43 -0700)]
am 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce

* commit '8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4':
  Implements swipe in editor menu

11 years agoMerge "Implements swipe in editor menu" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 23:40:34 +0000 (23:40 +0000)]
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce

11 years agoam 4c644f36: Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:12:30 +0000 (16:12 -0700)]
am 4c644f36: Fix to imports in NewPhotoModule.

* commit '4c644f3687d88ea13ff82c3f79b36585ea2c387b':
  Fix to imports in NewPhotoModule.

11 years agoFix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.

Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef

11 years agoam dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub...
Ruben Brunk [Tue, 9 Apr 2013 23:01:18 +0000 (16:01 -0700)]
am dcd1dd98: Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce

* commit 'dcd1dd986bc8455ce822e8d9e7a46ea103228351':
  Moving crop to a separate activity.  Refactoring.

11 years agoMerge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce

11 years agoMoving crop to a separate activity. Refactoring.
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity.  Refactoring.

Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce

11 years agoImplements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 22:29:35 +0000 (15:29 -0700)]
Implements swipe in editor menu

Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393

11 years agoam 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub...
Angus Kong [Tue, 9 Apr 2013 21:51:58 +0000 (14:51 -0700)]
am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce

* commit '355eaea088a348c394909fea6c9f812ff25e87ac':
  Add more gestures and animations in FilmStripView.

11 years agoMerge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:49:55 +0000 (21:49 +0000)]
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce