OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoMerge "Video: Add the mute functionality." into gb-ub-photos-bryce
Teng-Hui Zhu [Fri, 16 Nov 2012 17:53:16 +0000 (09:53 -0800)]
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce

11 years agoam 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '139efdbcd66d718b0d24d42e2ea18432469ac005':
  Import translations. DO NOT MERGE

11 years agoam b0aae659: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am b0aae659: (-s ours) Import translations. DO NOT MERGE

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

11 years agoVideo: Add the mute functionality.
Teng-Hui Zhu [Tue, 13 Nov 2012 18:39:26 +0000 (10:39 -0800)]
Video: Add the mute functionality.

1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.

bug:7543943

Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 9 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 9 Nov 2012 22:19:12 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:52:00 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:51:36 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:48:48 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:48:20 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 7 Nov 2012 00:06:28 +0000 (16:06 -0800)]
am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '85d20a07d6412f453e7956c105ff8f8548094186':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Nov 2012 19:57:33 +0000 (11:57 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Nov 2012 19:56:55 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
Angus Kong [Fri, 2 Nov 2012 17:38:26 +0000 (10:38 -0700)]
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce

11 years agoam 3252800c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:22:18 +0000 (07:22 -0700)]
am 3252800c: (-s ours) Import translations. DO NOT MERGE

* commit '3252800c7fe6bdb69b066eae0db739d06cfec64d':
  Import translations. DO NOT MERGE

11 years agoDon't use activatedBackgroundIndicator under API 14
Angus Kong [Fri, 2 Nov 2012 08:53:22 +0000 (16:53 +0800)]
Don't use activatedBackgroundIndicator under API 14

bug:7460473
Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:06:42 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Gingerbread support-ish" into gb-ub-photos-bryce
John Reck [Wed, 31 Oct 2012 22:10:18 +0000 (15:10 -0700)]
Merge "Gingerbread support-ish" into gb-ub-photos-bryce

11 years agoGingerbread support-ish
John Reck [Wed, 31 Oct 2012 00:34:20 +0000 (17:34 -0700)]
Gingerbread support-ish

This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee

11 years agoam 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:40:39 +0000 (09:40 -0700)]
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 31 Oct 2012 16:39:39 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:18:19 +0000 (09:18 -0700)]
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8d0392d623a88ace36fc4358c0d78e00377ca97f':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:20:48 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:20:20 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:15:23 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:14:41 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 29 Oct 2012 21:42:26 +0000 (14:42 -0700)]
am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 29 Oct 2012 21:40:57 +0000 (14:40 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoDisable save button when there's no modification
Doris Liu [Mon, 29 Oct 2012 20:11:10 +0000 (13:11 -0700)]
Disable save button when there's no modification

Bug: 7353884
Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 15:17:19 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 15:16:45 +0000 (08:16 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 17540e58: Do not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 10:32:32 +0000 (03:32 -0700)]
am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '17540e58b8454e820a6273365cee94742d9b9900':
  Do not copy XMP data if it has TinyPlanet filter

11 years agoDo not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 01:35:11 +0000 (18:35 -0700)]
Do not copy XMP data if it has TinyPlanet filter

bug:7429072
Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3

11 years agoam 49af06e2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 23:44:35 +0000 (16:44 -0700)]
am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit '49af06e229cdb52c4318dd6fd71d3c469fb5779a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 15:48:01 +0000 (08:48 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 15:47:33 +0000 (08:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sun, 28 Oct 2012 03:51:26 +0000 (20:51 -0700)]
am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Sun, 28 Oct 2012 03:50:00 +0000 (20:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Sun, 28 Oct 2012 03:49:44 +0000 (20:49 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sun, 28 Oct 2012 03:48:14 +0000 (20:48 -0700)]
am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5583758af4174a627c35358218b61bf039cf5e74':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Sun, 28 Oct 2012 03:46:55 +0000 (20:46 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Sun, 28 Oct 2012 03:46:19 +0000 (20:46 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 12:01:00 +0000 (05:01 -0700)]
am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit '798f4a914d47e69496374051fab386a3536c9698':
  Hold WakeLock for batch delete operation

11 years agoMerge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 11:59:23 +0000 (04:59 -0700)]
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Oct 2012 08:29:19 +0000 (01:29 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Oct 2012 08:28:35 +0000 (01:28 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Oct 2012 08:24:08 +0000 (01:24 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Oct 2012 08:23:25 +0000 (01:23 -0700)]
Import translations. DO NOT MERGE

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

11 years agoHold WakeLock for batch delete operation
Bobby Georgescu [Thu, 25 Oct 2012 21:55:55 +0000 (14:55 -0700)]
Hold WakeLock for batch delete operation

Bug: 6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a

11 years agoam 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 00:51:05 +0000 (17:51 -0700)]
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
  Add loading spinner

11 years agoMerge "Add loading spinner" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)]
Merge "Add loading spinner" into gb-ub-photos-arches

11 years agoAdd loading spinner
John Reck [Thu, 25 Oct 2012 17:08:37 +0000 (10:08 -0700)]
Add loading spinner

 Bug: 7408575

Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9

11 years agoam d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Fri, 26 Oct 2012 00:01:13 +0000 (17:01 -0700)]
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'd72971e683069d463c78117037414e5286689549':
  Fixed crop intent.

11 years agoMerge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 23:59:41 +0000 (16:59 -0700)]
Merge "Fixed crop intent." into gb-ub-photos-arches

11 years agoFixed crop intent.
Ruben Brunk [Thu, 25 Oct 2012 22:53:42 +0000 (15:53 -0700)]
Fixed crop intent.

Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091

11 years agoam 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos...
Ruben Brunk [Thu, 25 Oct 2012 22:11:16 +0000 (15:11 -0700)]
am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '15aff7c3b27e2938cea3734cb350671386d210c7':
  Tagged strings in XML with translation info.

11 years agoMerge "Tagged strings in XML with translation info." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 22:09:23 +0000 (15:09 -0700)]
Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

11 years agoam 8bc296e2: Fix crash when starting filtereditor
nicolasroard [Thu, 25 Oct 2012 19:19:50 +0000 (12:19 -0700)]
am 8bc296e2: Fix crash when starting filtereditor

* commit '8bc296e233298dbc76da22f01aaffec11e539d19':
  Fix crash when starting filtereditor

11 years agoTagged strings in XML with translation info.
Ruben Brunk [Thu, 25 Oct 2012 19:03:54 +0000 (12:03 -0700)]
Tagged strings in XML with translation info.

Bug: 7403813
Change-Id: Iff1ec505c2c6fbfc11f7f472cc2e67430cf3715d

11 years agoFix crash when starting filtereditor
nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]
Fix crash when starting filtereditor

bug:7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8

11 years agoam ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
nicolasroard [Thu, 25 Oct 2012 04:13:26 +0000 (21:13 -0700)]
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7':
  Remove the old photo editor

11 years agoMerge "Remove the old photo editor" into gb-ub-photos-arches
nicolasroard [Thu, 25 Oct 2012 04:11:06 +0000 (21:11 -0700)]
Merge "Remove the old photo editor" into gb-ub-photos-arches

11 years agoam 2c6ea941: Add rotation to tinyplanet view
nicolasroard [Thu, 25 Oct 2012 01:39:48 +0000 (18:39 -0700)]
am 2c6ea941: Add rotation to tinyplanet view

* commit '2c6ea941a80ea22317d664e329aed51f5f7417b9':
  Add rotation to tinyplanet view

11 years agoRemove the old photo editor
nicolasroard [Thu, 25 Oct 2012 00:55:51 +0000 (17:55 -0700)]
Remove the old photo editor

bug:7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)

11 years agoAdd rotation to tinyplanet view
nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]
Add rotation to tinyplanet view

bug:7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d

11 years agoam 7592704e: Fixes UI stuff
nicolasroard [Thu, 25 Oct 2012 00:28:56 +0000 (17:28 -0700)]
am 7592704e: Fixes UI stuff

* commit '7592704e662e49e4bbf3ba86a43d790774829bb0':
  Fixes UI stuff

11 years agoFixes UI stuff
nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]
Fixes UI stuff

bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f

11 years agoam 0a23b42e: Change background and panel colors
nicolasroard [Wed, 24 Oct 2012 22:54:46 +0000 (15:54 -0700)]
am 0a23b42e: Change background and panel colors

* commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6':
  Change background and panel colors

11 years agoChange background and panel colors
nicolasroard [Wed, 24 Oct 2012 22:43:56 +0000 (15:43 -0700)]
Change background and panel colors

bug:7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4

11 years agoam eb6a24e1: Took out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:50:41 +0000 (11:50 -0700)]
am eb6a24e1: Took out aspect ratio switching.

* commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9':
  Took out aspect ratio switching.

11 years agoTook out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:05:45 +0000 (11:05 -0700)]
Took out aspect ratio switching.

Bug: 7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9

11 years agoam a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 24 Oct 2012 16:44:29 +0000 (09:44 -0700)]
am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 15:18:03 +0000 (08:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 15:17:26 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE

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

11 years agoUse NO_VALUE in ground truth of exif test when no valid value from exiftool
Earl Ou [Thu, 18 Oct 2012 08:46:53 +0000 (16:46 +0800)]
Use NO_VALUE in ground truth of exif test when no valid value from exiftool

Change-Id: Ia33edf0aba8562eb2dbd61b5753657f245bf7310

11 years agoam 67fefdb9: add support for black and white filters, add rotation API to tiny planet
John Hoford [Tue, 23 Oct 2012 22:59:16 +0000 (15:59 -0700)]
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
  add support for black and white filters, add rotation API to tiny planet

11 years agoadd support for black and white filters, add rotation API to tiny planet
John Hoford [Tue, 23 Oct 2012 22:17:12 +0000 (15:17 -0700)]
add support for black and white filters, add rotation API to tiny planet

bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120

11 years agoam 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:33:08 +0000 (15:33 -0700)]
am 41a3a3be: Fix slider layout

* commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525':
  Fix slider layout

11 years agoFix slider layout
nicolasroard [Tue, 23 Oct 2012 22:25:39 +0000 (15:25 -0700)]
Fix slider layout

bug:7383094
Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c

11 years agoam 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:47:53 +0000 (12:47 -0700)]
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '361f6234c02207b2d812db0b2aeed267013c9a1f':
  Fix flickering in geometry panel

11 years agoFix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel

bug:7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5

11 years agoam a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:42:53 +0000 (11:42 -0700)]
am a9f280f9: Add copyright notices

* commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
  Add copyright notices

11 years agoAdd copyright notices
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices

bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1

11 years agoam 2569df23: Merge "Shows filtered images in geometry modules and comparison." into...
nicolasroard [Tue, 23 Oct 2012 17:36:12 +0000 (10:36 -0700)]
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '2569df233987d1f43400a813ceb2ce72c738a4c3':
  Shows filtered images in geometry modules and comparison.

11 years agoMerge "Shows filtered images in geometry modules and comparison." into gb-ub-photos...
nicolasroard [Tue, 23 Oct 2012 17:34:10 +0000 (10:34 -0700)]
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

11 years agoShows filtered images in geometry modules and comparison.
nicolasroard [Sat, 20 Oct 2012 19:32:05 +0000 (12:32 -0700)]
Shows filtered images in geometry modules and comparison.

bug:7279469
bug:7379286
bug:7344214
bug:7379140

Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves

Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8

11 years agoam 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:03 +0000 (08:57 -0700)]
am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:54:02 +0000 (07:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:53:21 +0000 (07:53 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos...
Doris Liu [Tue, 23 Oct 2012 00:57:52 +0000 (17:57 -0700)]
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '3a64ad361b9d48407abd902b26949d3c6b34af66':
  Show panorama thumbs in Gallery grid view

11 years agoShow panorama thumbs in Gallery grid view
Doris Liu [Sat, 20 Oct 2012 02:16:14 +0000 (19:16 -0700)]
Show panorama thumbs in Gallery grid view

Bug: 7362229
Bug: 7378208

In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.

Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b

11 years agoam 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 21:50:25 +0000 (14:50 -0700)]
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4':
  Increase album label size on high-res screens

11 years agoMerge "Increase album label size on high-res screens" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 21:48:42 +0000 (14:48 -0700)]
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

11 years agoam 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Oct 2012 21:29:02 +0000 (14:29 -0700)]
am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '73c89b45b122cbdcbcffa618f0fa2386829d710a':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Oct 2012 21:28:07 +0000 (14:28 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoIncrease album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:18:32 +0000 (14:18 -0700)]
Increase album label size on high-res screens

Bug: 7382498
Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947

11 years agoam 0a32b7af: Fix to ensure visible history adapter strings are from xml.
Ruben Brunk [Mon, 22 Oct 2012 18:26:37 +0000 (11:26 -0700)]
am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '0a32b7afc5286a5c7aa334b9338591d61a49731f':
  Fix to ensure visible history adapter strings are from xml.