Merge remote branch 'goog/master' into merge
Conflicts: java/res/xml/method.xml java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java java/src/com/android/inputmethod/voice/VoiceIMEConnector.java Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8main
|
@ -4,6 +4,7 @@
|
||||||
<original-package android:name="com.android.inputmethod.latin" />
|
<original-package android:name="com.android.inputmethod.latin" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||||
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
|
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
|
||||||
<uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
|
<uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
|
|
Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 248 B |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 472 B |
Before Width: | Height: | Size: 520 B After Width: | Height: | Size: 442 B |
Before Width: | Height: | Size: 760 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 808 B After Width: | Height: | Size: 817 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 944 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 730 B After Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 718 B After Width: | Height: | Size: 763 B |
Before Width: | Height: | Size: 940 B After Width: | Height: | Size: 869 B |
Before Width: | Height: | Size: 963 B After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 448 B |
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 515 B |
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 126 B |
Before Width: | Height: | Size: 498 B After Width: | Height: | Size: 453 B |
Before Width: | Height: | Size: 811 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 725 B |
Before Width: | Height: | Size: 715 B After Width: | Height: | Size: 904 B |
Before Width: | Height: | Size: 1001 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 145 B After Width: | Height: | Size: 242 B |
Before Width: | Height: | Size: 745 B After Width: | Height: | Size: 831 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 9.1 KiB |
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 833 B After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 226 B After Width: | Height: | Size: 242 B |
After Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 807 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 4.0 KiB |
After Width: | Height: | Size: 812 B |
After Width: | Height: | Size: 892 B |
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 970 B |
Before Width: | Height: | Size: 438 B After Width: | Height: | Size: 795 B |
Before Width: | Height: | Size: 789 B After Width: | Height: | Size: 960 B |
Before Width: | Height: | Size: 958 B After Width: | Height: | Size: 1013 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 511 B |
Before Width: | Height: | Size: 360 B After Width: | Height: | Size: 498 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 315 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 634 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 428 B |
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 516 B |
Before Width: | Height: | Size: 520 B After Width: | Height: | Size: 539 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 468 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 469 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 526 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 521 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 544 B |
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 686 B |
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 718 B |
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 434 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 339 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 477 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 930 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 464 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 519 B |
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 335 B |
After Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 200 B After Width: | Height: | Size: 207 B |
Before Width: | Height: | Size: 292 B After Width: | Height: | Size: 296 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 210 B |
Before Width: | Height: | Size: 379 B After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 347 B |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 401 B |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 375 B |
Before Width: | Height: | Size: 388 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 367 B After Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 400 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 395 B |
After Width: | Height: | Size: 409 B |
After Width: | Height: | Size: 238 B |
After Width: | Height: | Size: 359 B |
After Width: | Height: | Size: 277 B |
After Width: | Height: | Size: 311 B |
After Width: | Height: | Size: 283 B |
After Width: | Height: | Size: 323 B |
After Width: | Height: | Size: 267 B |
After Width: | Height: | Size: 302 B |
After Width: | Height: | Size: 321 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 937 B |