OSDN Git Service

android-x86/packages-apps-Gallery2.git
9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Oct 2014 18:58:50 +0000 (11:58 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 5fe0d63f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:16:43 +0000 (22:16 +0000)]
am 5fe0d63f: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:49:36 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 3ffc2889: Merge "Remove dependencies on FloatMath"
Neil Fuller [Fri, 17 Oct 2014 14:56:00 +0000 (14:56 +0000)]
am 3ffc2889: Merge "Remove dependencies on FloatMath"

* commit '3ffc28897d40524e0b8869aebccc8b04551ba5cf':
  Remove dependencies on FloatMath

9 years agoMerge "Remove dependencies on FloatMath"
Neil Fuller [Fri, 17 Oct 2014 14:46:46 +0000 (14:46 +0000)]
Merge "Remove dependencies on FloatMath"

9 years agoRemove dependencies on FloatMath
Neil Fuller [Thu, 2 Oct 2014 15:00:27 +0000 (16:00 +0100)]
Remove dependencies on FloatMath

See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I202064d78aeb125035c87257100e949da93c116c

9 years agoam 5d95f0c5: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 20:49:06 +0000 (20:49 +0000)]
am 5d95f0c5: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 07:43:10 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam deafb56c: am 014369d5: Bring Gallery2 manifest into parity with CROP support
Alan Newberger [Thu, 18 Sep 2014 00:52:42 +0000 (00:52 +0000)]
am deafb56c: am 014369d5: Bring Gallery2 manifest into parity with CROP support

* commit 'deafb56cfa3cd0756f1d702c79111d2cb2fce31b':
  Bring Gallery2 manifest into parity with CROP support

9 years agoam 014369d5: Bring Gallery2 manifest into parity with CROP support
Alan Newberger [Thu, 18 Sep 2014 00:47:02 +0000 (00:47 +0000)]
am 014369d5: Bring Gallery2 manifest into parity with CROP support

* commit '014369d5abdcd23e951d31021144d2e0039cd218':
  Bring Gallery2 manifest into parity with CROP support

9 years agoBring Gallery2 manifest into parity with CROP support
Alan Newberger [Thu, 18 Sep 2014 00:33:16 +0000 (17:33 -0700)]
Bring Gallery2 manifest into parity with CROP support

Gallery2 does not support http/https CROPping, so remove them
from manifest.

Tested app on device and confirmed Gallery2 is still successfully
a CROP app for content URIs after this modification.

Bug: 15919429
Change-Id: Ib0dacdbf3013d8a2f35a07a8ea0e15070ebdb2e7

9 years agoam 5e9c64f2: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 18:03:27 +0000 (18:03 +0000)]
am 5e9c64f2: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 58305fc4: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:36:19 +0000 (15:36 +0000)]
am 58305fc4: (-s ours) Import translations. DO NOT MERGE

* commit '58305fc4246cd82429b8882a4aca22c21fdc89d4':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Sep 2014 06:17:28 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 6af85e3f: (-s ours) am a1dfe362: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:45:05 +0000 (16:45 +0000)]
am 6af85e3f: (-s ours) am a1dfe362: (-s ours) Import translations. DO NOT MERGE

* commit '6af85e3f1bca2f6f9e8a4220998b8d76dfc997f5':
  Import translations. DO NOT MERGE

9 years agoam a1dfe362: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:32:30 +0000 (16:32 +0000)]
am a1dfe362: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 24 Aug 2014 20:18:25 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 282de588: (-s ours) am 5a470175: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 17 Aug 2014 14:24:19 +0000 (14:24 +0000)]
am 282de588: (-s ours) am 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '282de588c41341f0a0ba4f7c6e503b417d0b748d':
  Import translations. DO NOT MERGE

9 years agoam 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 17 Aug 2014 14:09:10 +0000 (14:09 +0000)]
am 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

9 years agoam f57c84ff: (-s ours) am ceed9be0: (-s ours) am 385d27f9: (-s ours) am 9c33ce0b...
Baligh Uddin [Sat, 16 Aug 2014 23:35:45 +0000 (23:35 +0000)]
am f57c84ff: (-s ours) am ceed9be0: (-s ours) am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam ceed9be0: (-s ours) am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translati...
Baligh Uddin [Sat, 16 Aug 2014 23:23:26 +0000 (23:23 +0000)]
am ceed9be0: (-s ours) am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Aug 2014 23:04:24 +0000 (23:04 +0000)]
am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE

* commit '385d27f97bc9cf0b35c7e847153d7f1a6968c5e9':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 17 Aug 2014 13:53:51 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Aug 2014 07:12:43 +0000 (00:12 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 9c33ce0b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 22:41:49 +0000 (22:41 +0000)]
am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE

* commit '9c33ce0b25b8db02c1719b1c38c05b4246e417a8':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 21:36:42 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoStart new task for Gallery trampolines
Alan Newberger [Sat, 9 Aug 2014 02:03:55 +0000 (19:03 -0700)]
Start new task for Gallery trampolines

When testing the Camera trampoline, even in the full gallery app
from a JB to K upgrade, I noticed that the Camera app was starting
in the Gallery trampoline's task -- two recents even with
excludeFromRecents true. Was still the case in the new trampoline.
Adding FLAG_ACTIVITY_NEW_TASK addressed this, also with some
manifest changes in the trampoline in another CL. Photos was working,
I believe because photos activities explicitly set a task affinity
to shield themselves from G+, thus forcing a new task. Also, this
helped shield activities when both trampolines are active. That is,
if Camera was started via its trampoline, then Photos, the Photos
shortcut opened Camera because it already had an activity in the
trampoline's task. Even if Photos works now, this does no harm and
ensures we're not relying on the implementation of another APK.

Bug: 16843573
Change-Id: Ifa6d65ef2b00a4ffc6df78f13dba16270113509d

9 years agoBuild against the NDK libraries.
Ying Wang [Tue, 22 Jul 2014 19:27:43 +0000 (12:27 -0700)]
Build against the NDK libraries.

That way you don't have dependency on the platform libraries, which in
turn depends on things like libcompiler_rt-extras, which isn't exposed
to apps_only build.

Bug: 16398512
Change-Id: Ie7cf54c97c57b13e82c1891970eb3731a68ae075

9 years agoRemove deprecated locales - DO NOT MERGE
Baligh Uddin [Sat, 19 Jul 2014 20:05:22 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE

Change-Id: I31af0be894572dd5d2862bf58840f76ba8b8e802

9 years agoCall setLocalMatrix before setShader. do not merge
Leon Scroggins III [Wed, 9 Jul 2014 18:54:31 +0000 (14:54 -0400)]
Call setLocalMatrix before setShader. do not merge

Now that setLocalMatrix does not modify associated Paints, we need
to call it before assigning the Shader to the Paint.

BUG:14315916
Change-Id: I6778a35eff36515e18c53a979dd69d8aecd1401d
(cherry picked from commit ce3b2ee2c6512a0eac9dbd54641a196baa68ba3f)

9 years agoam 35d4b725: (-s ours) am 30d0576f: (-s ours) am 3fa82573: (-s ours) am 8fe98c70...
Baligh Uddin [Sun, 6 Jul 2014 21:48:49 +0000 (21:48 +0000)]
am 35d4b725: (-s ours) am 30d0576f: (-s ours) am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translations. DO NOT MERGE

* commit '35d4b725b3c87db9583248cd63a6f6ffa6deeff7':
  Import translations. DO NOT MERGE

9 years agoam 30d0576f: (-s ours) am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translati...
Baligh Uddin [Sun, 6 Jul 2014 21:41:51 +0000 (21:41 +0000)]
am 30d0576f: (-s ours) am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translations. DO NOT MERGE

* commit '30d0576f2a60b3a82cfeed6778dc60d763bfb654':
  Import translations. DO NOT MERGE

9 years agoam 6316f5ff: (-s ours) am 8d2d3d46: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:37:30 +0000 (21:37 +0000)]
am 6316f5ff: (-s ours) am 8d2d3d46: (-s ours) Import translations. DO NOT MERGE

* commit '6316f5ff2a8c3de69e6580c9220809242683f0c1':
  Import translations. DO NOT MERGE

9 years agoam 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:34:53 +0000 (21:34 +0000)]
am 3fa82573: (-s ours) am 8fe98c70: (-s ours) Import translations. DO NOT MERGE

* commit '3fa825732965bf71301fbf722c6388168d1df11e':
  Import translations. DO NOT MERGE

9 years agoam 8d2d3d46: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:30:24 +0000 (21:30 +0000)]
am 8d2d3d46: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 8fe98c70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:16 +0000 (21:28 +0000)]
am 8fe98c70: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:40:09 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:36:46 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:36:10 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Jun 2014 09:56:19 +0000 (02:56 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 2f471180: (-s ours) am 612e3bb4: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Jun 2014 17:04:36 +0000 (17:04 +0000)]
am 2f471180: (-s ours) am 612e3bb4: (-s ours) Import translations. DO NOT MERGE

* commit '2f471180def1d5bc05dae9db7fb8aaae495c1b60':
  Import translations. DO NOT MERGE

9 years agoam 612e3bb4: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Jun 2014 16:54:36 +0000 (16:54 +0000)]
am 612e3bb4: (-s ours) Import translations. DO NOT MERGE

* commit '612e3bb4f83bd704fea44699dfa0f1c92a90efe4':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 18:03:09 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Jun 2014 19:49:23 +0000 (12:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Jun 2014 20:41:00 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 13 Jun 2014 22:35:09 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Jun 2014 20:02:54 +0000 (13:02 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 19:43:27 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 2 Jun 2014 20:54:48 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 May 2014 20:18:37 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 27 May 2014 17:54:02 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoam 5618712f: am 9cde04ed: am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"
Narayan Kamath [Tue, 27 May 2014 11:13:44 +0000 (11:13 +0000)]
am 5618712f: am 9cde04ed: am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"

* commit '5618712ff6c534b723eab504e28a6f587150a10b':
  Gallery2 : only build for 32-bit

9 years agoam 9cde04ed: am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"
Narayan Kamath [Tue, 27 May 2014 11:10:12 +0000 (11:10 +0000)]
am 9cde04ed: am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"

* commit '9cde04ed08f3a5201a007d78b3c89f43fb3003e0':
  Gallery2 : only build for 32-bit

9 years agoam 53fd3c7c: Merge "Gallery2 : only build for 32-bit"
Narayan Kamath [Tue, 27 May 2014 11:04:39 +0000 (11:04 +0000)]
am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"

* commit '53fd3c7cdf18c8f0ddc2dcc3954019bad34dd3fd':
  Gallery2 : only build for 32-bit

9 years agoMerge "Gallery2 : only build for 32-bit"
Narayan Kamath [Tue, 27 May 2014 11:01:10 +0000 (11:01 +0000)]
Merge "Gallery2 : only build for 32-bit"

9 years agoGallery2 : only build for 32-bit
Andreas Gampe [Fri, 18 Apr 2014 22:50:07 +0000 (15:50 -0700)]
Gallery2 : only build for 32-bit

Gallery2 depends on librsjni, which currently only builds for arm,
mips and x86.

(cherry picked from commit c9f714b65cdb05cef4797f30a42d006b80140aaf)

Change-Id: I7fd5363b453ca149bbd24e889f03a7bae6f4032e

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 May 2014 22:10:40 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 4abb94af: (-s ours) am 87b440b9: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:24:23 +0000 (03:24 +0000)]
am 4abb94af: (-s ours) am 87b440b9: (-s ours) Import translations. DO NOT MERGE

* commit '4abb94af4bec8702dc18fcc6e88c7f60f1d332db':
  Import translations. DO NOT MERGE

9 years agoam 87b440b9: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:15:46 +0000 (03:15 +0000)]
am 87b440b9: (-s ours) Import translations. DO NOT MERGE

* commit '87b440b9569367579de39a31d1c74e296ec4ade3':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 22:07:48 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 20 May 2014 19:14:35 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE

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

10 years agoUpdate ingest importer code
Bobby Georgescu [Wed, 14 May 2014 17:19:19 +0000 (10:19 -0700)]
Update ingest importer code

Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 May 2014 19:44:47 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam ccc1d754: am 2cfc3a8f: Merge commit \'a9c4376daac3b9deda0c617b6df393e741885f37...
Bill Yi [Wed, 30 Apr 2014 12:50:18 +0000 (12:50 +0000)]
am ccc1d754: am 2cfc3a8f: Merge commit \'a9c4376daac3b9deda0c617b6df393e741885f37\' into HEAD

* commit 'ccc1d7542f194002ba6ca1e166a4309b288c5a99':

10 years agoam 2cfc3a8f: Merge commit \'a9c4376daac3b9deda0c617b6df393e741885f37\' into HEAD
Bill Yi [Wed, 30 Apr 2014 00:59:34 +0000 (00:59 +0000)]
am 2cfc3a8f: Merge commit \'a9c4376daac3b9deda0c617b6df393e741885f37\' into HEAD

* commit '2cfc3a8f9a3d600c1d40161cd532eb45bec92dda':

10 years agoMerge commit 'a9c4376daac3b9deda0c617b6df393e741885f37' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:34:25 +0000 (11:34 -0700)]
Merge commit 'a9c4376daac3b9deda0c617b6df393e741885f37' into HEAD

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Apr 2014 20:03:04 +0000 (13:03 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 21:52:07 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 9f83fb9c: (-s ours) am 04aee4fb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:20:22 +0000 (02:20 +0000)]
am 9f83fb9c: (-s ours) am 04aee4fb: (-s ours) Import translations. DO NOT MERGE

* commit '9f83fb9c0da7de7eb377a19a1b13a86d8835ccb2':
  Import translations. DO NOT MERGE

10 years agoam 04aee4fb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:13:25 +0000 (02:13 +0000)]
am 04aee4fb: (-s ours) Import translations. DO NOT MERGE

* commit '04aee4fb961356c3985b174ca4ac6cda15dc1c7e':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 01:09:27 +0000 (18:09 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 19849052: am 3d736418: Merge "Use basic editor for sharpen filter."
Alan Newberger [Tue, 22 Apr 2014 13:37:50 +0000 (13:37 +0000)]
am 19849052: am 3d736418: Merge "Use basic editor for sharpen filter."

* commit '19849052309067476ebfbf647a4593a521d4cc80':
  Use basic editor for sharpen filter.

10 years agoam 3d736418: Merge "Use basic editor for sharpen filter."
Alan Newberger [Tue, 22 Apr 2014 13:32:07 +0000 (13:32 +0000)]
am 3d736418: Merge "Use basic editor for sharpen filter."

* commit '3d73641843682089be63cd248465497f007b93a1':
  Use basic editor for sharpen filter.

10 years agoMerge "Use basic editor for sharpen filter."
Alan Newberger [Mon, 21 Apr 2014 23:13:26 +0000 (23:13 +0000)]
Merge "Use basic editor for sharpen filter."

10 years agoam 6996a1fc: am 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundle...
Ying Wang [Mon, 21 Apr 2014 13:36:53 +0000 (13:36 +0000)]
am 6996a1fc: am 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."

* commit '6996a1fc34e0e5531f2368612805665cde628f27':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

10 years agoam 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundl...
Ying Wang [Sat, 19 Apr 2014 00:05:11 +0000 (00:05 +0000)]
am 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."

* commit '6ad0c4ffc3d50a6829a984c2ac37525680fc61eb':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

10 years agoMerge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
Ying Wang [Fri, 18 Apr 2014 23:56:22 +0000 (23:56 +0000)]
Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."

10 years agoNow LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Ying Wang [Fri, 18 Apr 2014 01:33:18 +0000 (18:33 -0700)]
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

Change-Id: Id0a381ce06370347670ab9b324039ccc2222f93c

10 years agoGallery2 : only build for 32-bit
Andreas Gampe [Fri, 18 Apr 2014 22:50:07 +0000 (15:50 -0700)]
Gallery2 : only build for 32-bit

Gallery2 depends on librsjni, which currently only builds for arm,
mips and x86.

Change-Id: I4fbf12f525941b75a7b47581db2ba43cf1abbbeb

10 years agoNow LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Ying Wang [Fri, 18 Apr 2014 01:33:18 +0000 (18:33 -0700)]
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.

Change-Id: Id0a381ce06370347670ab9b324039ccc2222f93c

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 19:51:29 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:40:06 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:35:19 +0000 (13:35 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 19 Mar 2014 20:44:04 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:08:46 +0000 (13:08 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 7a6bd46d: Merge "A couple of fixes"
Narayan Kamath [Tue, 11 Mar 2014 18:42:23 +0000 (18:42 +0000)]
am 7a6bd46d: Merge "A couple of fixes"

* commit '7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
  A couple of fixes

10 years agoam 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"
Narayan Kamath [Fri, 7 Mar 2014 20:15:48 +0000 (20:15 +0000)]
am 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '6b0afa7eecaa2e4faff5b12218af692a363d3d53':
  A couple of fixes

10 years agoam 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"
Narayan Kamath [Fri, 7 Mar 2014 16:14:24 +0000 (16:14 +0000)]
am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '36e3fb8dafd0523538f14ced00d7c97a05398841':
  A couple of fixes

10 years agoam 7a6bd46d: Merge "A couple of fixes"
Narayan Kamath [Fri, 7 Mar 2014 16:11:19 +0000 (16:11 +0000)]
am 7a6bd46d: Merge "A couple of fixes"

* commit '7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
  A couple of fixes

10 years agoMerge "A couple of fixes"
Narayan Kamath [Fri, 7 Mar 2014 15:31:27 +0000 (15:31 +0000)]
Merge "A couple of fixes"

10 years agoam e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"
Nick Kralevich [Fri, 7 Mar 2014 01:33:43 +0000 (01:33 +0000)]
am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"

* commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c':
  gallery: change typo '&&' to '||'

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Mar 2014 21:28:00 +0000 (13:28 -0800)]
Import translations. DO NOT MERGE

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

10 years agoA couple of fixes
Kévin PETIT [Fri, 7 Feb 2014 16:43:56 +0000 (16:43 +0000)]
A couple of fixes

- using LDFLAGS doesn't pull the required dependencies, move
  to using LOCAL_SHARED_LIBRARIES
- eliminate 'implicit declaration' warnings

Change-Id: I57f6feca6bfcf8b2e9d439462a33c9757cdde07d
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Mar 2014 20:56:55 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Feb 2014 20:36:23 +0000 (12:36 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Feb 2014 21:47:07 +0000 (13:47 -0800)]
Import translations. DO NOT MERGE

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

10 years agoUse basic editor for sharpen filter.
Jun Su [Sun, 23 Feb 2014 06:13:14 +0000 (14:13 +0800)]
Use basic editor for sharpen filter.

Currently gallery's sharpen filter is relate to the editor id =
R.id.imageShow, which is not point to any valid editor.
As a result native gallery sharpen function will cause exception and fail.
Change to use basic editor.

Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be

10 years agoam e219163b: (-s ours) am d75a08be: (-s ours) am ddaf6e73: (-s ours) am 4ee527a4...
Baligh Uddin [Thu, 20 Feb 2014 23:15:48 +0000 (23:15 +0000)]
am e219163b: (-s ours) am d75a08be: (-s ours) am ddaf6e73: (-s ours) am 4ee527a4: (-s ours) am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 77a5fec0: (-s ours) am 035598eb: (-s ours) am f4b8d07b: (-s ours) am e6e69360...
Baligh Uddin [Thu, 20 Feb 2014 23:15:47 +0000 (23:15 +0000)]
am 77a5fec0: (-s ours) am 035598eb: (-s ours) am f4b8d07b: (-s ours) am e6e69360: (-s ours) am 7537e615: (-s ours) am 53851696: (-s ours) Import translations. DO NOT MERGE

* commit '77a5fec019c5241500df41a3b1f6371a6f9bb976':
  Import translations. DO NOT MERGE

10 years agoam d75a08be: (-s ours) am ddaf6e73: (-s ours) am 4ee527a4: (-s ours) am 36f05fbe...
Baligh Uddin [Thu, 20 Feb 2014 21:24:50 +0000 (21:24 +0000)]
am d75a08be: (-s ours) am ddaf6e73: (-s ours) am 4ee527a4: (-s ours) am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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