Dan Albert
eee3201c74
Merge "Stop mixing and matching platform and NDK."
...
am: b0d902f
* commit 'b0d902f2e4f90ee4fd0eda46fa16133bdd2d09d8':
Stop mixing and matching platform and NDK.
2016-03-24 01:34:51 +00:00
Dan Albert
b0d902f2e4
Merge "Stop mixing and matching platform and NDK."
2016-03-24 01:26:09 +00:00
Dan Albert
a4e9383971
Stop mixing and matching platform and NDK.
...
The library was being built with the NDK, but the test is being built
with the platform, in this case building against the NDK STL headers
and then using the platform library, which are not ABI compatible.
Bug: http://b/27801981
Change-Id: I7386dfe6ac73334d7c1b1e0cbc8dc346c84313bf
2016-03-22 17:06:45 -07:00
Geoff Mendal
126c6bdd25
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: aa89882
-s ours
* commit 'aa89882508f514cca4972f4b4011324c5949049e':
Import translations. DO NOT MERGE
2016-03-19 02:37:13 +00:00
Geoff Mendal
fd22f77ba3
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 4024459
-s ours
* commit '4024459f0dead33dee901e0d6b6b53fd6e16164f':
Import translations. DO NOT MERGE
2016-03-19 02:37:12 +00:00
Geoff Mendal
7cfe3ab05a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: c8395b8
-s ours
* commit 'c8395b88018a2d18e7cd0b46888600626493d3c8':
Import translations. DO NOT MERGE
2016-03-19 02:37:12 +00:00
Geoff Mendal
e03bcd10ce
Import translations. DO NOT MERGE
...
am: 36ef606
-s ours
* commit '36ef6068fd1e91635a7d515d752595c9f37cd5da':
Import translations. DO NOT MERGE
2016-03-19 02:37:11 +00:00
Geoff Mendal
aa89882508
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:35:32 +00:00
Geoff Mendal
4024459f0d
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:35:00 +00:00
Geoff Mendal
a8fcb7664c
Import translations. DO NOT MERGE
...
Change-Id: Ie8dddc467e695a05206fcbc8e0ec6cbcb66108ee
Auto-generated-cl: translation import
2016-03-18 22:34:19 -04:00
Geoff Mendal
0178a854f2
Import translations. DO NOT MERGE
...
Change-Id: I16a6b97b27126824e7a2f58c82af51485cfa1171
Auto-generated-cl: translation import
2016-03-18 22:33:06 -04:00
Geoff Mendal
c8395b8801
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:31:52 +00:00
Geoff Mendal
6a55e5731d
Import translations. DO NOT MERGE
...
Change-Id: I412e1b013c24b9e4464fb7800630a300388e1ad8
Auto-generated-cl: translation import
2016-03-18 22:30:12 -04:00
Geoff Mendal
36ef6068fd
Import translations. DO NOT MERGE
...
Change-Id: I0ec016baae37e091b250af7cd9a1ff1d9df3ef73
Auto-generated-cl: translation import
2016-03-18 22:27:33 -04:00
Jeff Sharkey
1775b73f2b
Follow framework refactoring.
...
am: a9298f8
* commit 'a9298f88442aae49a0817513209230e3e6e8d4e0':
Follow framework refactoring.
2016-03-17 22:14:24 +00:00
Jeff Sharkey
a9298f8844
Follow framework refactoring.
...
Bug: 27531029
Change-Id: I7ebd335e68a5ca44348e19544d1ec66be60cdd88
2016-03-17 11:34:21 -06:00
Keisuke Kuroyanagi
b31cd18ea6
Merge "Start full screen mode on first tap when HW keyborad is connected." into nyc-dev
...
am: c29921f
* commit 'c29921fe7c3f3efb47c6c760055e773bd030ca35':
Start full screen mode on first tap when HW keyborad is connected.
2016-03-16 06:40:25 +00:00
Keisuke Kuroyanagi
c29921fe7c
Merge "Start full screen mode on first tap when HW keyborad is connected." into nyc-dev
2016-03-16 06:33:08 +00:00
Keisuke Kuroyanagi
48adccf349
Start full screen mode on first tap when HW keyborad is connected.
...
LatinIME checks hardware keyboard presence and software keyboard
visibility to decide whether to start full screen mode.
This doesn't work well with the recent update on "Show input method"
(Bug: 22517687, Id4d332e3909590c68345e).
On the first tap, software keyboard is not shown and hardware keyboard
is connected; so full screen mode is not started. However,
onEvaluateInputViewShown may return true ant software keyboard may be
brought up.
In this care, on the second tap, software keyboard is visible so full
screen mode will be started regardless of hardware keyboard presence.
This CL checks onEvaluateInputViewShown to decide whether to start
full screen mode.
Bug: 27234709
Change-Id: I587262cc36e5fccc59620b4bd2d2c3c05c72232f
2016-03-15 18:42:46 +09:00
Yohei Yukawa
fb6242581f
Change "touch" to "tap" in LatinIME.
...
am: 2715add718
* commit '2715add7181729655860518b10e03a85599d6777':
Change "touch" to "tap" in LatinIME.
2016-03-14 14:58:04 +00:00
Yohei Yukawa
2715add718
Change "touch" to "tap" in LatinIME.
...
Bug: 26883567
Change-Id: I580ee65bfa0c53c219f71a17a0e0c08cf70368fb
2016-03-11 22:33:14 -08:00
Geoff Mendal
e1aab2c58c
Import translations. DO NOT MERGE
...
am: f836c0f641
-s ours
* commit 'f836c0f64145afd0dc9d0256c6667acf6af13e48':
Import translations. DO NOT MERGE
2016-03-09 13:21:36 +00:00
Geoff Mendal
f836c0f641
Import translations. DO NOT MERGE
...
Change-Id: Ia05e008bcc73b8b66bff4d739e5a2b1b57f19ffb
Auto-generated-cl: translation import
2016-03-09 05:13:51 -08: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
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
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
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
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