OSDN Git Service

android-x86/packages-apps-Camera2.git
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

11 years agoadd vibrance fix a free in shadows
John Hoford [Thu, 4 Oct 2012 21:12:36 +0000 (14:12 -0700)]
add vibrance fix a free in shadows

bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2

11 years agoam f8d0367e: am 5448bf80: Implement sharpen
nicolasroard [Fri, 5 Oct 2012 00:24:08 +0000 (17:24 -0700)]
am f8d0367e: am 5448bf80: Implement sharpen

* commit 'f8d0367ea29515689c58ac821434947a888d1ca4':
  Implement sharpen

11 years agoam 5448bf80: Implement sharpen
nicolasroard [Fri, 5 Oct 2012 00:22:24 +0000 (17:22 -0700)]
am 5448bf80: Implement sharpen

* commit '5448bf8095483574649afcc2add7f153670c7450':
  Implement sharpen

11 years agoImplement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01

11 years agoam 9edd1a64: am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 23:20:09 +0000 (16:20 -0700)]
am 9edd1a64: am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches

* commit '9edd1a647f92ed1216c44ac85135eb4f732a7442':
  Fix build break in tests

11 years agoam 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 23:18:47 +0000 (16:18 -0700)]
am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches

* commit '94805da05624e939ff402a9586cddacaf622a716':
  Fix build break in tests

11 years agoMerge "Fix build break in tests" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 23:17:19 +0000 (16:17 -0700)]
Merge "Fix build break in tests" into gb-ub-photos-arches

11 years agoam 731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 23:00:11 +0000 (16:00 -0700)]
am 731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '731bd8aac8794bbfc53a863d6004ef761ae98bf0':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 22:58:20 +0000 (15:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoFix build break in tests
George Mount [Thu, 4 Oct 2012 22:57:20 +0000 (15:57 -0700)]
Fix build break in tests

 Bug 7259843

Change-Id: If40a7da72261039e3d6fcd3a00669ed7c900c658

11 years agoam 38192a53: am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 4 Oct 2012 22:54:13 +0000 (15:54 -0700)]
am 38192a53: am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '38192a53e82e7e1cce99c79c37b352578936e3e2':
  Import translations. DO NOT MERGE

11 years agoam d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 4 Oct 2012 22:52:35 +0000 (15:52 -0700)]
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Thu, 4 Oct 2012 22:50:35 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam b0057409: am 9c6c01dd: Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:27:18 +0000 (15:27 -0700)]
am b0057409: am 9c6c01dd: Fix build. Missing dummy class for Gallery2.

* commit 'b005740953ac9e6a0a0d1014b4acfa9c9980e111':
  Fix build. Missing dummy class for Gallery2.

11 years agoam 9c6c01dd: Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:17:21 +0000 (15:17 -0700)]
am 9c6c01dd: Fix build. Missing dummy class for Gallery2.

* commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8':
  Fix build. Missing dummy class for Gallery2.

11 years agoFix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:04:23 +0000 (15:04 -0700)]
Fix build. Missing dummy class for Gallery2.

 Bug 7259843

Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614

11 years agoam d5e9f02d: am 29b553a5: Merge "Support panorama progress items in Gallery." into...
George Mount [Thu, 4 Oct 2012 21:48:12 +0000 (14:48 -0700)]
am d5e9f02d: am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

* commit 'd5e9f02de0de89f4a04091e00a76fbd915ea7e2b':
  Support panorama progress items in Gallery.

11 years agoam 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos...
George Mount [Thu, 4 Oct 2012 21:45:41 +0000 (14:45 -0700)]
am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

* commit '29b553a54cbe4d95c174121e4f956a74117a4fc9':
  Support panorama progress items in Gallery.

11 years agoMerge "Support panorama progress items in Gallery." into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 21:44:34 +0000 (14:44 -0700)]
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

11 years agoam 41190e10: am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content...
Bobby Georgescu [Thu, 4 Oct 2012 21:06:42 +0000 (14:06 -0700)]
am 41190e10: am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches

* commit '41190e100f3dd3e895d378f752c7f4661c690f88':
  Don't allow switching to filmstrip in get content intent

11 years agoam 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into...
Bobby Georgescu [Thu, 4 Oct 2012 21:04:02 +0000 (14:04 -0700)]
am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches

* commit '8a415f457fe9fd18b369ac4ec354a33e3affcb94':
  Don't allow switching to filmstrip in get content intent

11 years agoMerge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos...
Bobby Georgescu [Thu, 4 Oct 2012 21:02:36 +0000 (14:02 -0700)]
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches

11 years agoam 3158c0f2: am 0eefb173: Merge "Upscale images to fill screen for slideshow" into...
Bobby Georgescu [Thu, 4 Oct 2012 20:57:32 +0000 (13:57 -0700)]
am 3158c0f2: am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

* commit '3158c0f214169dd7e1dc7ff50368f840cdcd148f':
  Upscale images to fill screen for slideshow

11 years agoam 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos...
Bobby Georgescu [Thu, 4 Oct 2012 20:55:38 +0000 (13:55 -0700)]
am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

* commit '0eefb1733f5ff2e2f6f4846bdbd8873639b4d085':
  Upscale images to fill screen for slideshow

11 years agoMerge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
Bobby Georgescu [Thu, 4 Oct 2012 20:54:04 +0000 (13:54 -0700)]
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

11 years agoUpscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:22:05 +0000 (13:22 -0700)]
Upscale images to fill screen for slideshow

Bug: 7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to 7232758 will set the size of the
screennails appropriately based on screen size.

Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10

11 years agoDon't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 18:59:01 +0000 (11:59 -0700)]
Don't allow switching to filmstrip in get content intent

Bug: 7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1

11 years agoam ca4241c8: am b1a51397: Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:49:56 +0000 (11:49 -0700)]
am ca4241c8: am b1a51397: Snap back photo after swipe in y-direction in filmstrip

* commit 'ca4241c8e87434636ccc29468f700e83ecd83a46':
  Snap back photo after swipe in y-direction in filmstrip

11 years agoam b1a51397: Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:47:54 +0000 (11:47 -0700)]
am b1a51397: Snap back photo after swipe in y-direction in filmstrip

* commit 'b1a513974d59c1dc14e004338b6795d6c3c5e5e8':
  Snap back photo after swipe in y-direction in filmstrip

11 years agoSupport panorama progress items in Gallery.
Angus Kong [Wed, 19 Sep 2012 12:39:45 +0000 (20:39 +0800)]
Support panorama progress items in Gallery.

 Bug 7259843
 Add dummy files for showing panorama progress in filmstrip.

Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:42:08 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:41:43 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoSnap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:15:43 +0000 (11:15 -0700)]
Snap back photo after swipe in y-direction in filmstrip

Bug: 7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c

11 years agoam a4ca12ee: Merge "@#!0 Bug #7275145" into jb-mr1-dev
Romain Guy [Thu, 4 Oct 2012 18:09:21 +0000 (11:09 -0700)]
am a4ca12ee: Merge "@#!0 Bug #7275145" into jb-mr1-dev

* commit 'a4ca12ee030fa79403b5e2cde20238a99c6e8673':
  @#!$# Bug #7275145

11 years agoMerge "@#!$# Bug #7275145" into jb-mr1-dev
Romain Guy [Thu, 4 Oct 2012 18:07:25 +0000 (11:07 -0700)]
Merge "@#!$# Bug #7275145" into jb-mr1-dev

11 years agoam 31bf2be0: am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos...
Pin Ting [Thu, 4 Oct 2012 13:57:56 +0000 (06:57 -0700)]
am 31bf2be0: am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches

* commit '31bf2be07efdecc91f0e72e5fd2d3750fa1755c8':
  Accelerate PNG image rendering.