OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going...
Bobby Georgescu [Sun, 7 Oct 2012 20:56:20 +0000 (13:56 -0700)]
am 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera

* commit '0d7f0850954f6878c98ef44bff4642252a3bb60f':
  Fix orientation locking issues when going back to Camera

11 years agoam d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera
Bobby Georgescu [Sun, 7 Oct 2012 20:54:20 +0000 (13:54 -0700)]
am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera

* commit 'd7b3cb87ddd85bd6e361b0dabe0dd02d0bb53f7a':
  Fix orientation locking issues when going back to Camera

11 years agoam bbc99316: Fix orientation locking issues when going back to Camera
Bobby Georgescu [Sun, 7 Oct 2012 20:53:02 +0000 (13:53 -0700)]
am bbc99316: Fix orientation locking issues when going back to Camera

* commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8':
  Fix orientation locking issues when going back to Camera

11 years agoFix orientation locking issues when going back to Camera
Bobby Georgescu [Sun, 7 Oct 2012 20:34:57 +0000 (13:34 -0700)]
Fix orientation locking issues when going back to Camera

Bug: 7287039
Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba

11 years agoam 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button...
Bobby Georgescu [Sun, 7 Oct 2012 19:59:23 +0000 (12:59 -0700)]
am 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '80a387c708704e9ffd15d33c860a46e0658211dd':
  Change display of 360 panorama button

11 years agoam 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 19:59:22 +0000 (12:59 -0700)]
am 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery

* commit '7261d8b1ecbfb83d22a13867bee8a2efc380ea39':
  Implement new grid layout in Gallery

11 years agoam b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 19:59:21 +0000 (12:59 -0700)]
am b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip

* commit 'b521475b9d3a8c78f698b1444bce2dfb9068ec5f':
  Tune swipe to delete in filmstrip

11 years agoam 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos...
John Reck [Sun, 7 Oct 2012 19:59:20 +0000 (12:59 -0700)]
am 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '948a613eeed911c4e7f5f83aec86935cb9ec526d':
  Animation support

11 years agoam 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exceptio...
Bobby Georgescu [Sun, 7 Oct 2012 19:59:20 +0000 (12:59 -0700)]
am 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '963ee8d209cd60a07614d1a7600e4a86791f3286':
  Fix display of spinner and SQL exception for view intent

11 years agoam 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sun, 7 Oct 2012 19:59:19 +0000 (12:59 -0700)]
am 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit '46471161f751285e6f4725ec087387bbfe7a441b':
  Change LOCAL_SDK_VERSION to current.

11 years agoam ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area...
George Mount [Sun, 7 Oct 2012 19:59:18 +0000 (12:59 -0700)]
am ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit 'ffe1a290c8788cfedfcea2e193c2a4a79ad71d9c':
  Move LightCycle undo to settings area.

11 years agoam d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent...
Bart Sears [Sun, 7 Oct 2012 19:59:17 +0000 (12:59 -0700)]
am d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'd289df8ef649de216f9a39ca7a0fca21cf78ae63':
  Revert "Upload screennails in tiles to prevent jank"

11 years agoam 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub...
Bobby Georgescu [Sun, 7 Oct 2012 19:56:29 +0000 (12:56 -0700)]
am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '9333917b0c31c4bdfd76593849f55d9e1e1988e9':
  Change display of 360 panorama button

11 years agoam e55e0485: am 43ba9f66: Implement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 19:56:28 +0000 (12:56 -0700)]
am e55e0485: am 43ba9f66: Implement new grid layout in Gallery

* commit 'e55e04857bb2bfe46cedc0c9888c3a065e868efd':
  Implement new grid layout in Gallery

11 years agoam 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 19:56:27 +0000 (12:56 -0700)]
am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip

* commit '4cd1ceeebe17b6accc63e09400e737f38a8374f6':
  Tune swipe to delete in filmstrip

11 years agoam 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches
John Reck [Sun, 7 Oct 2012 19:56:26 +0000 (12:56 -0700)]
am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '04f97ab482b56cdf9fd23388838164dccc6c29c9':
  Animation support

11 years agoam 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view...
Bobby Georgescu [Sun, 7 Oct 2012 19:56:22 +0000 (12:56 -0700)]
am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '9fe7d852f12fece9350a1c1c653edd66d543e9df':
  Fix display of spinner and SQL exception for view intent

11 years agoam ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sun, 7 Oct 2012 19:56:21 +0000 (12:56 -0700)]
am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit 'ed1ab4c567b470158d54aae1d407de3b863f2c0f':
  Change LOCAL_SDK_VERSION to current.

11 years agoam 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb...
George Mount [Sun, 7 Oct 2012 19:56:20 +0000 (12:56 -0700)]
am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '75b984c012293889d14988681511a162ccff255e':
  Move LightCycle undo to settings area.

11 years agoam ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"
Bart Sears [Sun, 7 Oct 2012 19:56:20 +0000 (12:56 -0700)]
am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'ec147fde392f8c74be7c65abdf6f6916ee96f3e0':
  Revert "Upload screennails in tiles to prevent jank"

11 years agoam 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:17:05 +0000 (12:17 -0700)]
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '4de36129b57e3a5308c109a407ea17b4fa103fe4':
  Change display of 360 panorama button

11 years agoMerge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:15:56 +0000 (12:15 -0700)]
Merge "Change display of 360 panorama button" into gb-ub-photos-arches

11 years agoam 43ba9f66: Implement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 19:11:39 +0000 (12:11 -0700)]
am 43ba9f66: Implement new grid layout in Gallery

* commit '43ba9f6644e4183b8ee27f96de3dda703d136c52':
  Implement new grid layout in Gallery

11 years agoam 3711d3ea: Tune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 19:11:30 +0000 (12:11 -0700)]
am 3711d3ea: Tune swipe to delete in filmstrip

* commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0':
  Tune swipe to delete in filmstrip

11 years agoam 278e4fe0: Merge "Animation support" into gb-ub-photos-arches
John Reck [Sun, 7 Oct 2012 19:11:30 +0000 (12:11 -0700)]
am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches

* commit '278e4fe02f9754bc84a646988aa6ff31109b22e0':
  Animation support

11 years agoam 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into...
Bobby Georgescu [Sun, 7 Oct 2012 19:11:29 +0000 (12:11 -0700)]
am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5':
  Fix display of spinner and SQL exception for view intent

11 years agoam 9b672371: Change LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sun, 7 Oct 2012 19:11:28 +0000 (12:11 -0700)]
am 9b672371: Change LOCAL_SDK_VERSION to current.

* commit '9b672371b88dddce1b56f31503ac01c730768d06':
  Change LOCAL_SDK_VERSION to current.

11 years agoam 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sun, 7 Oct 2012 19:11:27 +0000 (12:11 -0700)]
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

* commit '87b226cd6777431be09d3c1fcb01453e386256b2':
  Move LightCycle undo to settings area.

11 years agoam ad7cf187: Revert "Upload screennails in tiles to prevent jank"
Bart Sears [Sun, 7 Oct 2012 19:11:26 +0000 (12:11 -0700)]
am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'ad7cf187bf0c11b05aa3eab7085148e0353f2af5':
  Revert "Upload screennails in tiles to prevent jank"

11 years agoImplement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 02:12:20 +0000 (19:12 -0700)]
Implement new grid layout in Gallery

Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31

11 years agoChange display of 360 panorama button
Bobby Georgescu [Sat, 6 Oct 2012 22:22:03 +0000 (15:22 -0700)]
Change display of 360 panorama button

Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
 filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc

11 years agoTune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 00:39:23 +0000 (17:39 -0700)]
Tune swipe to delete in filmstrip

Bug: 7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d

11 years agoMerge "Animation support" into gb-ub-photos-arches
John Reck [Sat, 6 Oct 2012 23:35:11 +0000 (16:35 -0700)]
Merge "Animation support" into gb-ub-photos-arches

11 years agoAnimation support
John Reck [Sat, 6 Oct 2012 23:15:52 +0000 (16:15 -0700)]
Animation support

 Bug: 7300696

Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d

11 years agoMerge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos...
Bobby Georgescu [Sat, 6 Oct 2012 22:05:42 +0000 (15:05 -0700)]
Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

11 years agoChange LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sat, 6 Oct 2012 19:29:50 +0000 (03:29 +0800)]
Change LOCAL_SDK_VERSION to current.

bug:7208909

Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57

11 years agoMerge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sat, 6 Oct 2012 19:25:08 +0000 (12:25 -0700)]
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

11 years agoFix display of spinner and SQL exception for view intent
Bobby Georgescu [Sat, 6 Oct 2012 08:06:43 +0000 (01:06 -0700)]
Fix display of spinner and SQL exception for view intent

Bug: 7288544
Bug: 7219163
Remove the query for photo DISPLAY_NAME in view intent
since it is no longer used, and hide the spinner when
launching PhotoPage via this intent.

Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7

11 years agoRevert "Upload screennails in tiles to prevent jank"
Bart Sears [Sat, 6 Oct 2012 18:19:14 +0000 (11:19 -0700)]
Revert "Upload screennails in tiles to prevent jank"

This CL is reported to cause images to not be displayed correctly when opened via the view intent.

Bug: 7299123

This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36

Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d

11 years agoam b29151ff: am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sat, 6 Oct 2012 04:09:23 +0000 (21:09 -0700)]
am b29151ff: am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sat, 6 Oct 2012 04:08:16 +0000 (21:08 -0700)]
am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '3208850256822bf63b5aa868af616bc9d129a632':
  Import translations. DO NOT MERGE

11 years agoam ebfd8b1e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Sat, 6 Oct 2012 04:07:59 +0000 (21:07 -0700)]
am ebfd8b1e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sat, 6 Oct 2012 04:07:21 +0000 (21:07 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Sat, 6 Oct 2012 04:06:33 +0000 (21:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMove LightCycle undo to settings area.
George Mount [Fri, 5 Oct 2012 23:17:13 +0000 (16:17 -0700)]
Move LightCycle undo to settings area.

 Bug 7294328

Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e

11 years agoam 73ae3bbd: am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters...
nicolasroard [Fri, 5 Oct 2012 23:26:00 +0000 (16:26 -0700)]
am 73ae3bbd: am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

* commit '73ae3bbd0dcc0fad138fc3e55cbc654d515fa2c4':
  Add scale factor / quality parameters in filters

11 years agoam bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters...
nicolasroard [Fri, 5 Oct 2012 23:23:57 +0000 (16:23 -0700)]
am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

* commit 'bdcc92ef09560e26b561af0bf71563cd2ae71086':
  Add scale factor / quality parameters in filters

11 years agoam df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub...
nicolasroard [Fri, 5 Oct 2012 23:22:00 +0000 (16:22 -0700)]
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

* commit 'df479ddec29551216a9344e4bae925f60185210a':
  Add scale factor / quality parameters in filters

11 years agoMerge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 23:20:49 +0000 (16:20 -0700)]
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

11 years agoam af92cf32: am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 5 Oct 2012 23:18:37 +0000 (16:18 -0700)]
am af92cf32: am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoam d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 5 Oct 2012 23:15:56 +0000 (16:15 -0700)]
am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoam e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Oct 2012 23:13:49 +0000 (16:13 -0700)]
am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 23:12:42 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoAdd scale factor / quality parameters in filters
nicolasroard [Fri, 5 Oct 2012 22:55:56 +0000 (15:55 -0700)]
Add scale factor / quality parameters in filters

bug:7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d

11 years agoam 7fc9fbf2: am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes...
Bobby Georgescu [Fri, 5 Oct 2012 22:43:18 +0000 (15:43 -0700)]
am 7fc9fbf2: am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

* commit '7fc9fbf2a40a8565a324e7d64171df14bdfa8ba1':
  Set the thumbnail/screennail sizes based on screensize

11 years agoam dd7c476e: am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 22:43:17 +0000 (15:43 -0700)]
am dd7c476e: am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensi...
Bobby Georgescu [Fri, 5 Oct 2012 22:40:00 +0000 (15:40 -0700)]
am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

* commit '4a48f3736b693b3be9fe714b63d2bcb4f00dae33':
  Set the thumbnail/screennail sizes based on screensize

11 years agoam 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 22:39:59 +0000 (15:39 -0700)]
am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '46a02a89c99c8819a21a952f9c8d9496222f6d42':
  Import translations. DO NOT MERGE

11 years agoam 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into...
Bobby Georgescu [Fri, 5 Oct 2012 22:38:16 +0000 (15:38 -0700)]
am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

* commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911':
  Set the thumbnail/screennail sizes based on screensize

11 years agoMerge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos...
Bobby Georgescu [Fri, 5 Oct 2012 22:37:40 +0000 (15:37 -0700)]
Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 22:36:49 +0000 (15:36 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoSet the thumbnail/screennail sizes based on screensize
Bobby Georgescu [Thu, 4 Oct 2012 21:04:13 +0000 (14:04 -0700)]
Set the thumbnail/screennail sizes based on screensize

Bug: 7232758
Prior to this CL, the thumbnail and screennail sizes were
hardcoded which resulted in mediocre image quality when
using the Gallery in general and the camera filmstrip.
Now, we set the size of these items based on the resolution
of the display. Because high-resolution devices tend to
have higher-performance graphics to drive their large
displays, we expect that this will not introduce any
significant performance impact.

Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf

11 years agoam 93319523: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 5 Oct 2012 22:26:21 +0000 (15:26 -0700)]
am 93319523: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '933195236d0e85a03469435ce1b1a374cfc77566':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 5 Oct 2012 22:25:22 +0000 (15:25 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoam ddc8db87: am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 5 Oct 2012 22:02:36 +0000 (15:02 -0700)]
am ddc8db87: am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoam b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 5 Oct 2012 21:59:55 +0000 (14:59 -0700)]
am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoam d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Oct 2012 21:56:32 +0000 (14:56 -0700)]
am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 21:54:25 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam afe8275c: am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:53:27 +0000 (13:53 -0700)]
am afe8275c: am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras

* commit 'afe8275c4a0d2d8d3517b14203dbfa49a4004470':
  Don't film strip animate when switching cameras

11 years agoam 6cf05936: am a6591448: Don\'t film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:51:43 +0000 (13:51 -0700)]
am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras

* commit '6cf059364b3c84e51b19cf335c708ecd107e0d25':
  Don't film strip animate when switching cameras

11 years agoam a6591448: Don\'t film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:49:52 +0000 (13:49 -0700)]
am a6591448: Don\'t film strip animate when switching cameras

* commit 'a65914485de7b82b96b616c7be738ab952e09c83':
  Don't film strip animate when switching cameras

11 years agoDon't film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:15:54 +0000 (13:15 -0700)]
Don't film strip animate when switching cameras

 Bug: 7265781

Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:06:06 +0000 (13:06 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:05:40 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:04:51 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 57bc6d71: am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:35:31 +0000 (12:35 -0700)]
am 57bc6d71: am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '57bc6d71e83c78cc3ca804a4cb7863ba454e7042':
  New UI...

11 years agoam 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:33:38 +0000 (12:33 -0700)]
am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '3c336202bb1f9afec7d16ae6877f6d49c92a6f2a':
  New UI...

11 years agoam 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:31:43 +0000 (12:31 -0700)]
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58':
  New UI...

11 years agoMerge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:30:24 +0000 (12:30 -0700)]
Merge "New UI..." into gb-ub-photos-arches

11 years agoNew UI...
nicolasroard [Fri, 5 Oct 2012 10:48:34 +0000 (03:48 -0700)]
New UI...

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:48:50 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:48:25 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 5 Oct 2012 15:17:42 +0000 (08:17 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I912fa9388d69152f0b15a06ec8cea548e47684e0

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 5 Oct 2012 14:00:04 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam d6120d06: am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:53:47 +0000 (20:53 -0700)]
am d6120d06: am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank

* commit 'd6120d06df5e9e9931568e2f1336047c03d9a918':
  Upload screennails in tiles to prevent jank

11 years agoam a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:51:47 +0000 (20:51 -0700)]
am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank

* commit 'a556c0581fcb4323146df5e1f7c28bbf35a0e8e5':
  Upload screennails in tiles to prevent jank

11 years agoam e29fc4a5: Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:50:08 +0000 (20:50 -0700)]
am e29fc4a5: Upload screennails in tiles to prevent jank

* commit 'e29fc4a51b99f12f7fae13fae272858df2e1af36':
  Upload screennails in tiles to prevent jank

11 years agoUpload screennails in tiles to prevent jank
Owen Lin [Mon, 24 Sep 2012 03:20:34 +0000 (11:20 +0800)]
Upload screennails in tiles to prevent jank

bug: 6399444

Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b

11 years agoam 996ec48f: am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the...
Hung-ying Tyan [Fri, 5 Oct 2012 02:39:08 +0000 (19:39 -0700)]
am 996ec48f: am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

* commit '996ec48f6f87a34c2be256ab27cdbcc1fbd94281':
  Open album in filmstrip only if the item exists.

11 years agoam 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists...
Hung-ying Tyan [Fri, 5 Oct 2012 02:37:30 +0000 (19:37 -0700)]
am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

* commit '002e90bf111c3eb5847f92e4d3ede899dfc8ba0f':
  Open album in filmstrip only if the item exists.

11 years agoam 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub...
Hung-ying Tyan [Fri, 5 Oct 2012 02:35:27 +0000 (19:35 -0700)]
am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

* commit '9bcba5b049f199ad78051c2ad27897cad389679d':
  Open album in filmstrip only if the item exists.

11 years agoMerge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
Hung-ying Tyan [Fri, 5 Oct 2012 02:33:35 +0000 (19:33 -0700)]
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

11 years agoam f038d2d2: am ca3c75ff: am f47e790e: Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:57:47 +0000 (17:57 -0700)]
am f038d2d2: am ca3c75ff: am f47e790e: Add a reset item menu

* commit 'f038d2d2556a79fe8988f06cac0ad9e402527bef':
  Add a reset item menu

11 years agoam ca3c75ff: am f47e790e: Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:55:45 +0000 (17:55 -0700)]
am ca3c75ff: am f47e790e: Add a reset item menu

* commit 'ca3c75ffbf1863a3e4bd827f74a61cc7657d6679':
  Add a reset item menu

11 years agoam f47e790e: Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:53:52 +0000 (17:53 -0700)]
am f47e790e: Add a reset item menu

* commit 'f47e790e3f3553f69abe054eec20bd7585118843':
  Add a reset item menu

11 years agoAdd a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:50:20 +0000 (17:50 -0700)]
Add a reset item menu

bug:7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb

11 years agoam e8a105c4: am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:39:09 +0000 (17:39 -0700)]
am e8a105c4: am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows

* commit 'e8a105c4b6e8b3b762feda4f6d487360312f30ea':
  add vibrance fix a free in shadows

11 years agoam 02b24ed2: am b559b2dd: add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:37:05 +0000 (17:37 -0700)]
am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows

* commit '02b24ed2e858d1dbef0d85bc485d4090dac47e17':
  add vibrance fix a free in shadows

11 years agoam b559b2dd: add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:34:36 +0000 (17:34 -0700)]
am b559b2dd: add vibrance fix a free in shadows

* commit 'b559b2dd6637660ddbbdbae79a742c9f0fb1180b':
  add vibrance fix a free in shadows