Commit graph

38856 commits

Author SHA1 Message Date
Mihai Nita
0c00da6468 Merge "LatinIME: change "Language & input" to -> "Languages & input"" into nyc-dev am: 4cd02adfd0
am: 6c40614203

* commit '6c406142035c61091f86346ed3a8c186f4bc68ae':
  LatinIME: change "Language & input" to -> "Languages & input"
2016-03-09 01:57:41 +00:00
Mihai Nita
6c40614203 Merge "LatinIME: change "Language & input" to -> "Languages & input"" into nyc-dev
am: 4cd02adfd0

* commit '4cd02adfd0cf4638ba61f78bd7c2f4265d0651ee':
  LatinIME: change "Language & input" to -> "Languages & input"
2016-03-09 01:55:51 +00:00
Mihai Niță
4cd02adfd0 Merge "LatinIME: change "Language & input" to -> "Languages & input"" into nyc-dev 2016-03-09 01:52:59 +00:00
Mihai Nita
9a65273e04 LatinIME: change "Language & input" to -> "Languages & input"
Because now the user can select more than one locale.

Bug: 26849449

Change-Id: I6921793c16ec8c65c44b3c54c816b73a623fb4f2
2016-03-08 17:47:01 -08:00
Yohei Yukawa
ddda22ad6c Use android:languageTag for Serbian-Latin layout. am: d3d36e3919
am: 1caad1dfa2

* commit '1caad1dfa2c5321017938c75f69588fa6f7e9013':
  Use android:languageTag for Serbian-Latin layout.
2016-03-04 23:00:03 +00:00
Yohei Yukawa
c8024de0e7 Map "sr-Latn" to "sr_ZZ" for internal use. am: 31a3f07c21
am: 091ffff370

* commit '091ffff370314a865a1c025a39f0dc6289af3cbf':
  Map "sr-Latn" to "sr_ZZ" for internal use.
2016-03-04 22:59:44 +00:00
Yohei Yukawa
1caad1dfa2 Use android:languageTag for Serbian-Latin layout.
am: d3d36e3919

* commit 'd3d36e391944b0a131707c81c8ac5374753660bc':
  Use android:languageTag for Serbian-Latin layout.
2016-03-04 22:55:47 +00:00
Yohei Yukawa
091ffff370 Map "sr-Latn" to "sr_ZZ" for internal use.
am: 31a3f07c21

* commit '31a3f07c2117180df524d6b2e78089897c8ea807':
  Map "sr-Latn" to "sr_ZZ" for internal use.
2016-03-04 22:55:31 +00:00
Yohei Yukawa
d3d36e3919 Use android:languageTag for Serbian-Latin layout.
Serbian-Latin is one of subtypes that our APIs could not easily deal
with their locale.

Now we can safely rely on BCP 47 language tag hence we should do.  See
my previous CLs [1][2][3] for details.

Note that this CL is supposed to have no effect on the behavior of
LatinIME because we internall remap "sr-Latn" to "sr_ZZ" [4].

 [1]: I77db5b99a7cf745d800db75baf135bb60ad04820
      8d6eeb01df72891acd3aa75e64aa1595a41cc96e
 [2]: I251d3d999afd13c0d618f2cb59e8ed3d47f21c98
      b8456a6a483ce62c81b92f613561fb761be0f3e8
 [3]: I37cb9ce196f2e23589e60ce34475504405778bbb
      f6997344e6
 [4]: I93ff0c75b3687bb1b913f451b9eb5f2820beefbc
      31a3f07c21

Bug: 27348943
Change-Id: Icd0667c40c6f1310699f3deb1234b7861ec2fa24
2016-03-04 13:08:23 -08:00
Yohei Yukawa
31a3f07c21 Map "sr-Latn" to "sr_ZZ" for internal use.
We want to expose Serbian (Latin) layout as "sr-Latn" to the system,
while our internal logic may not be ready to deal with "sr-Latn" yet.

As a temporary workaround, we remap "sr-Latn" into "sr_ZZ" for our
internal use.

Bug: 27348943
Change-Id: I93ff0c75b3687bb1b913f451b9eb5f2820beefbc
2016-03-04 13:07:17 -08:00
Yohei Yukawa
67ab868b93 Revert "Close FileChannels in UpdateHandler#copyFile." am: 4b46e71163
am: e1a9d7ae67

* commit 'e1a9d7ae6715fba1da71d536013e48b9b7e6f9f0':
  Revert "Close FileChannels in UpdateHandler#copyFile."
2016-03-04 00:03:44 +00:00
Yohei Yukawa
e1a9d7ae67 Revert "Close FileChannels in UpdateHandler#copyFile."
am: 4b46e71163

* commit '4b46e711632f6e5d868e6d84a6211384d37e1911':
  Revert "Close FileChannels in UpdateHandler#copyFile."
2016-03-03 22:00:47 +00:00
Yohei Yukawa
4b46e71163 Revert "Close FileChannels in UpdateHandler#copyFile."
This reverts commit 3e2670265e.

It turns out that the behavior change in libcore was unintentional, and
it was already fixed [1].  Let's revert our workaround back to see if
the existing code is compatible with N.

  [1]: Ibacb192abc37870c74a2500d65b94d68f9c2318e
       5e7b572c2b494ab86ddd2baca3883a40a6064c1e

Bug: 26239281
Change-Id: I6cd2340492d93251231e7ee37c3d4f82c1721293
2016-03-03 21:11:14 +00:00
Geoff Mendal
bd11b82b04 Merge "Import translations. DO NOT MERGE" 2016-02-29 13:26:58 +00:00
Geoff Mendal
6a7a2d7a97 Import translations. DO NOT MERGE
Change-Id: Ic9dbeb6bb1f618dd566ba5569ea606813e6134a5
Auto-generated-cl: translation import
2016-02-29 05:11:13 -08:00
Geoff Mendal
f449778998 Import translations. DO NOT MERGE
Change-Id: I9f90a04af17740a249cdbfcc5e9be957171f7fad
Auto-generated-cl: translation import
2016-02-29 05:09:04 -08:00
Baligh Uddin
cb46dccfbb Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bd517fb3bb -s ours
am: 8bfecc2521  -s ours

* commit '8bfecc25211524d60e26018da06a2f9dd30d3317':
  Import translations. DO NOT MERGE
2016-02-27 05:37:02 +00:00
Baligh Uddin
9aa5d489aa Import translations. DO NOT MERGE am: 522adee3cf -s ours
am: e4995d7490  -s ours

* commit 'e4995d7490b1828977917c663632edeb289dd7b6':
  Import translations. DO NOT MERGE
2016-02-27 05:36:46 +00:00
Baligh Uddin
8bfecc2521 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: bd517fb3bb  -s ours

* commit 'bd517fb3bb176db8123aef812cfbdbb09654c484':
  Import translations. DO NOT MERGE
2016-02-27 05:33:15 +00:00
Baligh Uddin
e4995d7490 Import translations. DO NOT MERGE
am: 522adee3cf  -s ours

* commit '522adee3cfd7b96a8c46c4c9ead91b917761b7fa':
  Import translations. DO NOT MERGE
2016-02-27 05:32:59 +00:00
Baligh Uddin
bd517fb3bb Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-27 05:30:00 +00:00
Baligh Uddin
522adee3cf Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I36bea98ac38c04e0ec8439923b5c1167c3fa721b
2016-02-26 17:22:55 -08:00
Baligh Uddin
65fa229539 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I3fae20273707ff85d3d0a15cf3a7c423b40fabf6
2016-02-26 17:20:47 -08:00
Baligh Uddin
4bec977da0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 033ee4cfce -s ours
am: 3774d51fd1  -s ours

* commit '3774d51fd185ee591a064fd17e0d288ec600e350':
  Import translations. DO NOT MERGE
2016-02-25 17:13:38 +00:00
Baligh Uddin
f306f81ab3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0f0e6d9caf -s ours
am: d8c66e1246  -s ours

* commit 'd8c66e12467556ed473bcf8f226a5e046a26cb0f':
  Import translations. DO NOT MERGE
2016-02-25 17:13:21 +00:00
Baligh Uddin
f54b81cae6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4fc7c8d2b7 -s ours
am: 49b9b5be82  -s ours

* commit '49b9b5be820c0850a17df611351e8802870acd62':
  Import translations. DO NOT MERGE
2016-02-25 17:13:03 +00:00
Baligh Uddin
4b7e468610 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: da7fcf9734 -s ours
am: 10dbd268bb  -s ours

* commit '10dbd268bb2de100e491eb5ede2dc562e0671740':
  Import translations. DO NOT MERGE
2016-02-25 17:12:47 +00:00
Baligh Uddin
af43fb0244 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8573a177e2 -s ours
am: ce294a76f8  -s ours

* commit 'ce294a76f84cb42ff7f4b85aa0799f25cafa79ba':
  Import translations. DO NOT MERGE
2016-02-25 17:12:29 +00:00
Baligh Uddin
5c81e57185 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9dc556a5e3 -s ours
am: 5716809c00  -s ours

* commit '5716809c008353c4cec6972517eb8ad19c2cab0b':
  Import translations. DO NOT MERGE
2016-02-25 17:12:12 +00:00
Baligh Uddin
7b2cd281eb Import translations. DO NOT MERGE am: cb83108117 -s ours
am: f274395042  -s ours

* commit 'f274395042790da73e2c8154600791b2598b2d35':
  Import translations. DO NOT MERGE
2016-02-25 17:11:57 +00:00
Baligh Uddin
3774d51fd1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 033ee4cfce  -s ours

* commit '033ee4cfce0fb9b37b4e35f192e4c69ed9bf5316':
  Import translations. DO NOT MERGE
2016-02-25 16:57:04 +00:00
Baligh Uddin
d8c66e1246 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0f0e6d9caf  -s ours

* commit '0f0e6d9cafd02b143b0a7be444bee39a379351f6':
  Import translations. DO NOT MERGE
2016-02-25 16:56:50 +00:00
Baligh Uddin
49b9b5be82 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4fc7c8d2b7  -s ours

* commit '4fc7c8d2b702be24cf4a5e0fbb674ffed54476be':
  Import translations. DO NOT MERGE
2016-02-25 16:56:36 +00:00
Baligh Uddin
10dbd268bb Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: da7fcf9734  -s ours

* commit 'da7fcf97345de3d22070a36baeda320a2821864c':
  Import translations. DO NOT MERGE
2016-02-25 16:56:18 +00:00
Baligh Uddin
ce294a76f8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8573a177e2  -s ours

* commit '8573a177e22c01f244bc924dc57feda482237413':
  Import translations. DO NOT MERGE
2016-02-25 16:56:04 +00:00
Baligh Uddin
5716809c00 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 9dc556a5e3  -s ours

* commit '9dc556a5e30b9ff49ebf6260888a84751fcf0d90':
  Import translations. DO NOT MERGE
2016-02-25 16:55:50 +00:00
Baligh Uddin
f274395042 Import translations. DO NOT MERGE
am: cb83108117  -s ours

* commit 'cb831081173e2ea85a0505e6c170008c9dc51732':
  Import translations. DO NOT MERGE
2016-02-25 16:55:36 +00:00
Baligh Uddin
033ee4cfce Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:30 +00:00
Baligh Uddin
0f0e6d9caf Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:28 +00:00
Baligh Uddin
4fc7c8d2b7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:26 +00:00
Baligh Uddin
da7fcf9734 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:24 +00:00
Baligh Uddin
8573a177e2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:22 +00:00
Baligh Uddin
9dc556a5e3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-02-25 16:23:20 +00:00
Keisuke Kuroyanagi
30069c96ab Merge "Close FileChannels in UpdateHandler#copyFile." into nyc-dev am: fce8ed98aa
am: 14ff0a66f0

* commit '14ff0a66f0fbda0dde63b4cf7b92595568e2d55e':
  Close FileChannels in UpdateHandler#copyFile.
2016-02-25 04:26:19 +00:00
Keisuke Kuroyanagi
14ff0a66f0 Merge "Close FileChannels in UpdateHandler#copyFile." into nyc-dev
am: fce8ed98aa

* commit 'fce8ed98aa738a13332b6ccc9c5b145f17fae51f':
  Close FileChannels in UpdateHandler#copyFile.
2016-02-25 04:25:24 +00:00
Keisuke Kuroyanagi
fce8ed98aa Merge "Close FileChannels in UpdateHandler#copyFile." into nyc-dev 2016-02-25 04:23:32 +00:00
Keisuke Kuroyanagi
3e2670265e Close FileChannels in UpdateHandler#copyFile.
Bug: 26239281
Change-Id: Ib30beb3548f8fb4a8e338b5da863ae28c252bc2b
2016-02-24 20:08:27 -08:00
Baligh Uddin
cb83108117 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: Ib7859a1e462deaea6024653192f1242164311371
2016-02-23 15:03:10 -08:00
Baligh Uddin
11d116c406 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I51c0478e91b05478b5b75be36e57675afc5beb25
2016-02-23 14:58:15 -08:00
Baligh Uddin
8721958ce5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: Id6852e18eaf95fb1cdf6b63aa8c626f945274e4a
2016-02-23 14:57:06 -08:00