OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 29 Oct 2012 21:44:09 +0000 (14:44 -0700)]
am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '1a2512cf1adf71c8a89e18eca40bef5bcc9fc451':
  Import translations. DO NOT MERGE

11 years agoam 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:44:07 +0000 (14:44 -0700)]
am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '115299f04552f97b019c45f1625a24b2c49b7a17':
  Import translations. DO NOT MERGE

11 years agoam 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 29 Oct 2012 21:43:00 +0000 (14:43 -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 jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 21:41:40 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:41:26 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam b3e7d7d8: am dc03ae14: Reset rotation flag
nicolasroard [Mon, 29 Oct 2012 17:07:21 +0000 (10:07 -0700)]
am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497':
  Reset rotation flag

11 years agoam dc03ae14: Reset rotation flag
nicolasroard [Mon, 29 Oct 2012 17:05:20 +0000 (10:05 -0700)]
am dc03ae14: Reset rotation flag

* commit 'dc03ae144d838714446b239f2b0c519d956af6ff':
  Reset rotation flag

11 years agoReset rotation flag
nicolasroard [Mon, 29 Oct 2012 16:35:47 +0000 (09:35 -0700)]
Reset rotation flag

bug:7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de

11 years agoam ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 15:58:07 +0000 (08:58 -0700)]
am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit 'ddc54044bfa994db4160442ff74b4ddf2e228681':
  Fix zooming position

11 years agoam 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 15:55:50 +0000 (08:55 -0700)]
am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '98990049451cda3540f6cff1ae8065c3675ed3d8':
  Fix zooming position

11 years agoMerge "Fix zooming position" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 15:53:16 +0000 (08:53 -0700)]
Merge "Fix zooming position" into gb-ub-photos-arches

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

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

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

Change-Id: I2bd22a0696bdcca4685ef89650155b4e4ebd33fa
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 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 10:35:05 +0000 (03:35 -0700)]
am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '031a07411e4ad53fe76c4ef6ed39d62dd429e406':
  Do not copy XMP data if it has TinyPlanet filter

11 years agoam 17540e58: Do not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 10:32:59 +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 fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 23:46:51 +0000 (16:46 -0700)]
am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE

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

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

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

11 years agoFix zooming position
nicolasroard [Fri, 26 Oct 2012 03:14:02 +0000 (20:14 -0700)]
Fix zooming position

bug:7386221
Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75

11 years agoam 49af06e2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 23:45:13 +0000 (16:45 -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:49:17 +0000 (08:49 -0700)]
Import translations. DO NOT MERGE

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

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

Change-Id: If68f5b73d5e9f60c1ffbd07be3ca47314211dd6d
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 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:57:32 +0000 (20:57 -0700)]
am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5ac0bdabc6be6b411b001aeabcc5ae6702251925':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Sun, 28 Oct 2012 03:55:50 +0000 (20:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:55:30 +0000 (20:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

* commit '10f64ff122ed917a19776256eb995637d00881c0':
  Import translations. DO NOT MERGE

11 years agoam 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sun, 28 Oct 2012 03:52:19 +0000 (20:52 -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-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 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 28 Oct 2012 03:49:32 +0000 (20:49 -0700)]
am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8275abe7a2d71107087a111b527336068ed28f7e':
  Import translations. DO NOT MERGE

11 years agoam 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:49:30 +0000 (20:49 -0700)]
am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '1cf344e2719c75f0590fd3ed13ec42820f97e29a':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Sun, 28 Oct 2012 03:48:12 +0000 (20:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoam 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Sun, 28 Oct 2012 03:48:07 +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 jb-mr1-dev
Baligh Uddin [Sun, 28 Oct 2012 03:47:26 +0000 (20:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet
nicolasroard [Sat, 27 Oct 2012 21:18:48 +0000 (14:18 -0700)]
am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '33d33c7ee22b02dc87085014fc178e0a80b946bb':
  Fix rounding issue affecting TinyPlanet

11 years agoam 2d2b69b0: Fix rounding issue affecting TinyPlanet
nicolasroard [Sat, 27 Oct 2012 21:16:36 +0000 (14:16 -0700)]
am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '2d2b69b0d86ad3131faf83164253a5255ff941ed':
  Fix rounding issue affecting TinyPlanet

11 years agoFix rounding issue affecting TinyPlanet
nicolasroard [Sat, 27 Oct 2012 17:54:18 +0000 (10:54 -0700)]
Fix rounding issue affecting TinyPlanet

bug:7428061
Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3

11 years agoam 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to...
Nicolas Roard [Sat, 27 Oct 2012 01:19:27 +0000 (18:19 -0700)]
am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit '90af32fb05b7c2be9807d6b53bd61b4093ed0e00':
  Changed rotated display parameter increments to 90.

11 years agoam d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub...
Nicolas Roard [Sat, 27 Oct 2012 01:19:26 +0000 (18:19 -0700)]
am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit 'd2a1f33fdcf77073f80c144eaaed24f4d28ab373':
  change thumbnail and reset behaviour

11 years agoam f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into...
Doris Liu [Sat, 27 Oct 2012 01:19:25 +0000 (18:19 -0700)]
am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit 'f245d2b716fdc26b59f1251bf55707cdc06c331a':
  Show panoViewer icon after "Back" from viewer

11 years agoam a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb...
Nicolas Roard [Sat, 27 Oct 2012 01:14:49 +0000 (18:14 -0700)]
am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e':
  Changed rotated display parameter increments to 90.

11 years agoam 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
Nicolas Roard [Sat, 27 Oct 2012 01:14:48 +0000 (18:14 -0700)]
am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c':
  change thumbnail and reset behaviour

11 years agoMerge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
Nicolas Roard [Sat, 27 Oct 2012 00:39:48 +0000 (17:39 -0700)]
Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

11 years agoMerge "change thumbnail and reset behaviour" into gb-ub-photos-arches
Nicolas Roard [Sat, 27 Oct 2012 00:39:29 +0000 (17:39 -0700)]
Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

11 years agoam 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos...
Doris Liu [Sat, 27 Oct 2012 00:32:35 +0000 (17:32 -0700)]
am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit '591974bceb89bccf3376a7c424017e847eca61df':
  Show panoViewer icon after "Back" from viewer

11 years agoMerge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
Doris Liu [Sat, 27 Oct 2012 00:30:01 +0000 (17:30 -0700)]
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

11 years agoShow panoViewer icon after "Back" from viewer
Doris Liu [Sat, 27 Oct 2012 00:17:17 +0000 (17:17 -0700)]
Show panoViewer icon after "Back" from viewer

Bug: 7407942
Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4

11 years agoam 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after...
George Mount [Fri, 26 Oct 2012 23:48:41 +0000 (16:48 -0700)]
am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit '6027d7638a2a9445a2a4bbef364d9c02982ffd0b':
  Remove black borders in Manta LightCycle capture after orientation change.

11 years agoam b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
George Mount [Fri, 26 Oct 2012 23:46:14 +0000 (16:46 -0700)]
am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7':
  Remove black borders in Manta LightCycle capture after orientation change.

11 years agochange thumbnail and reset behaviour
John Hoford [Fri, 26 Oct 2012 23:03:23 +0000 (16:03 -0700)]
change thumbnail and reset behaviour

bug:7386757
bug:7343047
Change-Id: I0b44309f047b790025fb806ce041e2265489f027

11 years agoRemove black borders in Manta LightCycle capture after orientation change.
George Mount [Wed, 24 Oct 2012 22:07:50 +0000 (15:07 -0700)]
Remove black borders in Manta LightCycle capture after orientation change.

 Bug 7344906

Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06

11 years agoam 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into...
Bobby Georgescu [Fri, 26 Oct 2012 22:31:40 +0000 (15:31 -0700)]
am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '2c8a24680ad88ab0028451716bff215aa6e91576':
  Fix the black lines near edge of thumbnails

11 years agoam 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos...
Bobby Georgescu [Fri, 26 Oct 2012 22:19:39 +0000 (15:19 -0700)]
am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '88870365af146d05162742c5f613fc92483b0a93':
  Fix the black lines near edge of thumbnails

11 years agoMerge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 22:11:25 +0000 (15:11 -0700)]
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

11 years agoChanged rotated display parameter increments to 90.
Ruben Brunk [Fri, 26 Oct 2012 20:48:09 +0000 (13:48 -0700)]
Changed rotated display parameter increments to 90.

Bug: 7393432
Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2

11 years agoam 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 17:08:17 +0000 (10:08 -0700)]
am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '38e64b25801cbec5004cd67ce22ebb6ca822bef1':
  Add proxy launcher

11 years agoam 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 17:04:45 +0000 (10:04 -0700)]
am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '10f975a628badbb400a97872c6704740ef936e46':
  Add proxy launcher

11 years agoMerge "Add proxy launcher" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 17:03:05 +0000 (10:03 -0700)]
Merge "Add proxy launcher" into gb-ub-photos-arches

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

* commit 'd58b942aaa15a8c1a3663329f8a4d2d275aed4a6':
  Hold WakeLock for batch delete operation

11 years agoam 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 12:01:07 +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 agoFix the black lines near edge of thumbnails
Owen Lin [Fri, 26 Oct 2012 10:55:49 +0000 (18:55 +0800)]
Fix the black lines near edge of thumbnails

1. Correct the positions of right and bottom borders
2. Turn off blending by using PoterDuffMode.SRC

bug: 7414307

Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471

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

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

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

Change-Id: I2bafd4427f86c8ceec724e5f6752c95a50bf2380
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:26:29 +0000 (01:26 -0700)]
Import translations. DO NOT MERGE

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

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

Change-Id: I8771039e735893f4aa0fab53074fa093d7cd21c1
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 agoam 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:55:01 +0000 (00:55 -0700)]
am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror

* commit '8fe5c7542d1de4e02c027318866ab2a2b020b94d':
  Fix colors in rotate and mirror

11 years agoam 8d8cdf7f: Fix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:52:54 +0000 (00:52 -0700)]
am 8d8cdf7f: Fix colors in rotate and mirror

* commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0':
  Fix colors in rotate and mirror

11 years agoFix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:02:18 +0000 (00:02 -0700)]
Fix colors in rotate and mirror

bug:7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600

11 years agoam 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos...
nicolasroard [Fri, 26 Oct 2012 06:43:31 +0000 (23:43 -0700)]
am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '7dcaeec6ef5841107f5b42990c5d9d56ddbb251f':
  Fix crash when showing history

11 years agoam 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:42:14 +0000 (23:42 -0700)]
am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '8b3ce9b01275151b653ea138324e47eb66a7b47e':
  Fix crash when showing history

11 years agoMerge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:41:00 +0000 (23:41 -0700)]
Merge "Fix crash when showing history" into gb-ub-photos-arches

11 years agoFix crash when showing history
nicolasroard [Fri, 26 Oct 2012 06:27:32 +0000 (23:27 -0700)]
Fix crash when showing history

bug:7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7

11 years agoam 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub...
Hung-ying Tyan [Fri, 26 Oct 2012 04:20:40 +0000 (21:20 -0700)]
am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '45dfd43eb36bad916cee573e8822008d12d2fdc6':
  Fix tiling effect when open a photo.

11 years agoam 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
Hung-ying Tyan [Fri, 26 Oct 2012 04:18:46 +0000 (21:18 -0700)]
am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '635aab5631e25488610ff5546c51ea2895dda2f0':
  Fix tiling effect when open a photo.

11 years agoMerge "Fix tiling effect when open a photo." into gb-ub-photos-arches
Hung-ying Tyan [Fri, 26 Oct 2012 04:17:12 +0000 (21:17 -0700)]
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

11 years agoam 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup"...
Nicolas Roard [Fri, 26 Oct 2012 02:24:36 +0000 (19:24 -0700)]
am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '7849722053ed8f154a83f41b7fec067b4e2a9864':
  Do not add crop into preset if in inital setup

11 years agoam 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos...
Nicolas Roard [Fri, 26 Oct 2012 02:23:20 +0000 (19:23 -0700)]
am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '24f28850adcb14a1de87e538f60f3bb309bed284':
  Do not add crop into preset if in inital setup

11 years agoMerge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
Nicolas Roard [Fri, 26 Oct 2012 02:21:45 +0000 (19:21 -0700)]
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

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 agoDo not add crop into preset if in inital setup
John Hoford [Fri, 26 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Do not add crop into preset if in inital setup

bug:7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93

11 years agoAdd proxy launcher
John Reck [Wed, 24 Oct 2012 18:11:51 +0000 (11:11 -0700)]
Add proxy launcher

 Bug: 7394901

Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c

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

* commit 'c62b066a240a17f0b99a65bfb9eb8210f8407e6e':
  Add loading spinner

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

* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
  Add loading spinner

11 years agoam dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb...
Mangesh Ghiware [Fri, 26 Oct 2012 00:50:21 +0000 (17:50 -0700)]
am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit 'dd7139babe7b1ae3893d329652f3efcab77652f0':
  Handle 360 panorama specific MIME type.

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 agoam 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
Mangesh Ghiware [Fri, 26 Oct 2012 00:47:30 +0000 (17:47 -0700)]
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '5388677d3078f2c218d22465c955e3df6b2ffbed':
  Handle 360 panorama specific MIME type.

11 years agoMerge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
Mangesh Ghiware [Fri, 26 Oct 2012 00:44:54 +0000 (17:44 -0700)]
Merge "Handle 360 panorama specific MIME type." 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 agoHandle 360 panorama specific MIME type.
Mangesh Ghiware [Wed, 10 Oct 2012 22:56:29 +0000 (15:56 -0700)]
Handle 360 panorama specific MIME type.

Bug: 7407448

Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef

11 years agoam bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied...
Ruben Brunk [Fri, 26 Oct 2012 00:02:15 +0000 (17:02 -0700)]
am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit 'bdd21912a4365a703716b16a636832f71c4c0d0c':
  Fix issue where aspect bounds don't get applied.

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

* commit '812d65bd1d8c30bdb0f174d2503e0042ac59b13c':
  Fixed crop intent.

11 years agoam 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub...
Ruben Brunk [Fri, 26 Oct 2012 00:00:58 +0000 (17:00 -0700)]
am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit '4164fabf5f9324adde9954130aad13c2f72aa24a':
  Fix issue where aspect bounds don't get applied.

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

* commit 'd72971e683069d463c78117037414e5286689549':
  Fixed crop intent.

11 years agoMerge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
Ruben Brunk [Fri, 26 Oct 2012 00:00:20 +0000 (17:00 -0700)]
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches