nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,985 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

2825 Commits (63be066544f19928d6a29c58c028cce7c95fa457)

Author SHA1 Message Date
Tadashi G. Takaoka 2d1e72b774 Merge "Revert "Disable Nepali layouts temporarily per product call"" 2014-01-15 03:50:58 +00:00
Tadashi G. Takaoka 4d1620f895 Revert "Disable Nepali layouts temporarily per product call" 
This reverts Id58cdf117d.
This also partially reverts I99be3d54d3.

This change must be checked in together with Ied923ed80b.

Bug: 6910787
Change-Id: Icdeee1b93a6b626b43fefc06d3bb3fe40d2e056b
 2014-01-15 12:31:44 +09:00
Tadashi G. Takaoka 7ae9efbb6a Revert "Remove Azerbaijani subtype" 
This reverts I0d2a98dffe.
This also partially reverts I99be3d54d3.

This change must be checked in together with Ibf49c89832.

Bug: 7963448
Change-Id: Idbb3e1ac9f4e067a0051f618946a345632102fb3
 2014-01-15 12:13:25 +09:00
Narayan Kamath 4f8e678bab Revert "Revert "Disable Nepali layouts temporarily per product call"" 
This reverts commit 93fdfc110b.

Change-Id: Ibe7bfa07aa2437701794209c16f017a88cd166b4
 2014-01-14 12:44:11 +00:00
Tadashi G. Takaoka 93fdfc110b Revert "Disable Nepali layouts temporarily per product call" 
This reverts Id58cdf117d.
This also partially reverts I456268b68f.

This change must be checked in together with I4d5c8ffa45.

Bug: 6910787
Change-Id: I59ba69f1b14164edea8eddf3784554a29a97e9b3
 2014-01-14 17:39:24 +09:00
Tadashi G. Takaoka 7504913807 Move phrase gesture related string resources to AOSP 
This change must be checked in together with Ica8fc5135.

Change-Id: I288d7083391954f1266a9b77ee4ffc0bc9d4229d
 2014-01-14 17:15:41 +09:00
Jean Chalard 62df0a6d53 Merge "Update dictionaries" 2014-01-14 03:44:20 +00:00
Jean Chalard 155cb77231 Update dictionaries 
This change has no effect on TRT results.

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654051
  version : 42 <=> 43
Body :
Added: dialogue 120
Added: dialogues 94

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> dictionaries/it_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

>>> java/res/raw/main_fr.dict
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> java/res/raw/main_it.dict
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

Bug: 12487270
Bug: 12344108
Change-Id: I94768e223d05ad2551a5508e9e01222a028665c4
 2014-01-14 10:37:15 +09:00
Geoff Mendal 9fa6663403 Import translations. DO NOT MERGE 
Change-Id: I3233aa7d5f64fbf8818e0065cd1da47d84070fb6
Auto-generated-cl: translation import
 2014-01-13 16:31:58 -08:00
Keisuke Kuroyanagi f96e0f07af Merge "Periodic wipe of the personalization dict." 2014-01-10 09:31:22 +00:00
Keisuke Kuroyanagi ba07df7fc1 Periodic wipe of the personalization dict. 
Bug: 12216453

Change-Id: Ie59dd19c044e9b1eb9b8bd805366200737ea506a
 2014-01-10 16:30:59 +09:00
Jean Chalard eab4d25210 Merge "Remove some warnings" 2014-01-09 05:45:10 +00:00
Jean Chalard b11339b3ab Remove some warnings 
Change-Id: I5cfa0d2fccc139bd6c45c5590a68c3e0c90534b8
 2014-01-09 14:04:34 +09:00
Baligh Uddin 941a4540bc Import translations. DO NOT MERGE 
Change-Id: Ia2d0f4528529df463307e1706cd4d7265b3958c1
Auto-generated-cl: translation import
 2014-01-08 13:45:51 -08:00
Baligh Uddin f75017de55 Import translations. DO NOT MERGE 
Change-Id: Ia0ef830a5bb3ed6fee1a5d113b2baec60bb51a97
Auto-generated-cl: translation import
 2014-01-07 07:27:26 -08:00
Tadashi G. Takaoka 74b5291b84 Merge "Remove language switch key from symbols and symbols shift keyboard" 2014-01-06 06:19:27 +00:00
Tadashi G. Takaoka d561228f95 Remove language switch key from symbols and symbols shift keyboard 
This change also fixes the background color of the left keys of the space key.

Bug: 12407208
Change-Id: Id869605146e9f72835f892c3c7ae14f118177394
 2014-01-06 15:02:50 +09:00
Tadashi G. Takaoka 12ba821bfb Add description of disabled voice input key option 
Bug: 12377179
Change-Id: I44d35c6fa82883710674ecca6f630d09076472fe
 2014-01-06 12:11:55 +09:00
Keisuke Kuroyanagi 5c4bd20331 Remove "Boost personalization dictionary" from settings. 
Change-Id: Iab05e42e947610f358472cd95d0319d0ab3f0b31
 2013-12-25 19:02:49 +09:00
Tadashi G. Takaoka 9c4de1e5f7 Use config_screen_metrics resource in BogusMoveEventDetector 
Change-Id: I6b957b43c6dd7ce4f639e46d248179662c1ee669
 2013-12-20 17:35:19 +09:00
Baligh Uddin 4f878a71b9 Import translations. DO NOT MERGE 
Change-Id: Iec55106743e61ca92f934f1280b0faf0bb2f4b1b
Auto-generated-cl: translation import
 2013-12-19 14:18:14 -08:00
Baligh Uddin 5e88407c18 Merge "Import translations. DO NOT MERGE" 2013-12-17 17:46:03 +00:00
Ken Wakasa da173b6ee3 Merge "Move "Personalized suggestions" option." 2013-12-17 13:52:00 +00:00
Keisuke Kuroyanagi 0a8e307a5f Move "Personalized suggestions" option. 
Bug: 11757851
Change-Id: I07411d53b75be767426571edca371f991efc97cb
 2013-12-17 21:01:06 +09:00
Tadashi G. Takaoka 3bb64ff3b2 Add Armenian "ligature ech yiwn" hint label 
Bug: 12100704
Change-Id: I9debef1662c29ab88f27b2fdd61d5f703c3a1c78
 2013-12-17 10:51:02 +09:00
Baligh Uddin 2ea0d56fb5 Import translations. DO NOT MERGE 
Change-Id: Iad038e310497a74f167e7f6cfda1f3bee6cd8f09
Auto-generated-cl: translation import
 2013-12-16 17:37:20 -08:00
Keisuke Kuroyanagi d4bb7df412 Add option to enable personalization dictionaries. 
Bug: 11757851

Change-Id: I4872c10793d4fd55c0bd9e5bc4650925de6d2c1d
 2013-12-16 19:17:31 +09:00
Tadashi G. Takaoka 3f6c983adc Merge "Don't use fullscreen mode on large phone" 2013-12-16 05:56:09 +00:00
Tadashi G. Takaoka d75d77200f Don't use fullscreen mode on large phone 
Bug: 11920652
Change-Id: Icc26c20c881bc586c800c31c90a45281dc408d2a
 2013-12-16 13:09:13 +09:00
Ken Wakasa 2c25c7c9e1 Fix locale names in the make-keyboard-text tool 
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
 2013-12-14 18:50:57 +09:00
Tadashi G. Takaoka a5b196e939 [FIX] Separate form factor dependent config resources 
This is a cherry-pick of I668b55a514.

Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
 2013-12-13 18:01:01 +09:00
Ken Wakasa 2fa3693c26 Reset to 9bd6dac470 
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
 2013-12-13 17:13:32 +09:00
Geoff Mendal 8db783ba81 Import translations. DO NOT MERGE 
Change-Id: I6c8ab6cd6d41a6692ef6b084e0218be4120d266c
Auto-generated-cl: translation import
 2013-12-02 15:05:00 -08:00
Geoff Mendal 7debaee7a4 Import translations. DO NOT MERGE 
Change-Id: Ib38c02136778584dc6a4d4215c6e346b2b48afaa
Auto-generated-cl: translation import
 2013-11-25 14:26:44 -08:00
Tadashi G. Takaoka 2eea2d5007 Update Color Scheme summary explicitly 
Bug: 11622614
Change-Id: I5464054425e4d688eaa39f96ba9a3a3c613c6f42
 2013-11-22 17:26:59 -08:00
Satoshi Kataoka ca5cdc6996 Show mic key option on sw540 device 
Bug: 11737760

Change-Id: Id50a7d393acf755cb04d3f8dc60327abeee5a671
 2013-11-22 17:26:51 -08:00
Tadashi G. Takaoka db86a6f271 Add keyboard color switch option 
Bug: 11622614
Change-Id: I25aa1ff7376fe72fd94ab2cb7190c61d7a98a1af
 2013-11-22 17:26:33 -08:00
Tadashi G. Takaoka 51352009b5 Add JB/ICS resources from Azuki MR1 release 
Bug: 11622614
Change-Id: I126fc42dd31e912788db0446b67a9d4ea80f848e
 2013-11-22 17:26:26 -08:00
Tadashi G. Takaoka fe5262a70d Rename KLP theme related resources 
Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
 2013-11-22 17:26:17 -08:00
Tadashi G. Takaoka d5e6044ded Rename KLP/JB/ICS common resource name suffixes to _holo 
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
 2013-11-22 17:26:08 -08:00
Tadashi G. Takaoka 978e2f67f7 Add key press vibration value for Motorola DVX 
Bug: 10884131
Change-Id: Id6d5589f3528de05c7b346ce55e926c3e18f22cc
 2013-11-22 17:25:57 -08:00
Baligh Uddin b4cc0ae075 Import translations. DO NOT MERGE 
This is a manual cherry-pick of Ib0c14a756a.  This change also copied
some missing locales' strings.xml and strings-action-keys.xml from
jb-ub-latinimegoogle branch.

Bug: 11622614
Change-Id: Ibc9cde4662b15da63b73ac2b545e0e94c358de67
 2013-11-21 11:28:47 +09:00
Tadashi G. Takaoka a5f5ab84c0 Add microphone key as long press of comma 
Bug: 11637249
Change-Id: Ib6202484ad12c63c8a38d8e12432007ab56d4a30
 2013-11-12 22:44:59 -08:00
Tadashi G. Takaoka 7033338017 Update popup panel background a bit draker 
Bug: 11169026
Change-Id: I164ab69eb263f58000ffed7b7d97fc6b356147d5
 2013-11-12 22:44:58 -08:00
Tadashi G. Takaoka d7d6088130 Revert back punctuations to the more keys keyboard of the period 
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
 2013-11-12 17:51:54 +09:00
Baligh Uddin 7505290c9a Import translations. DO NOT MERGE 
Change-Id: I598c4282b342132f3f9937a9652f570c3c1bc246
Auto-generated-cl: translation import
 2013-11-04 23:24:59 -08:00
Baligh Uddin 21dc0bfef0 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bayo 2013-11-01 14:28:23 +00:00
Baligh Uddin b8ee18c7fe These files were in the obsoleted locale 
directories and are not processed by the translation pipeline.
Moving them to their new locale directory.

Example: values-et/bools.xml moved to values-et-rEE/bools.xml

Bug: 11244796
 2013-10-31 20:44:05 -07:00
Baligh Uddin 7a5907b580 Import translations. DO NOT MERGE 
Change-Id: If3b0f523c86598e0dcf3d3c41e3bfcd5f87c116d
Auto-generated-cl: translation import
 2013-10-28 23:40:45 -07:00
Ken Wakasa 79ccba757a Update Setup Wizard welcome video & image 
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
 2013-10-22 05:23:48 -07:00
Satoshi Kataoka a6ee1e7b9a Don't show long-pressing emoji key on tablet 
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
 2013-10-22 05:23:47 -07:00
Satoshi Kataoka c43738069a Fix keyboard layout 
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
 2013-10-22 05:23:47 -07:00
Ken Wakasa 08360a5434 am a62dc281: Update input method subtype locales. 
* commit 'a62dc28121d72978d527eec2791d1caf43b563b8':
  Update input method subtype locales.

Change-Id: Id28f5ee33c201e1d335119c1b3d99bc30a10a131
 2013-10-22 19:43:09 +09:00
Satoshi Kataoka e4db349db0 am af846af8: Remove Azerbaijani subtype 
* commit 'af846af8bb7e4b49c99d7b0e051e70d03a5b7359':
  Remove Azerbaijani subtype
 2013-10-22 19:36:41 +09:00
Satoshi Kataoka 1760d363d4 Remove unexpectedly used resources 
Change-Id: I291269dbca71805a40d48a0e373b9561ad075f6b
 2013-10-18 15:05:35 +09:00
Baligh Uddin 12e4167ffc Import translations. DO NOT MERGE 
Change-Id: I83d28c60de84b09da48bd79aa9917f12bd850fdc
Auto-generated-cl: translation import
 2013-10-15 17:40:19 -07:00
Baligh Uddin 82cad2db96 Import translations. DO NOT MERGE 
Change-Id: Ie3282562a318563d607fea65c51efba90547d202
Auto-generated-cl: translation import
 2013-10-12 09:27:54 -07:00
Baligh Uddin 67337450d4 Import translations. DO NOT MERGE 
Change-Id: Ic51ef12040f5586db280ad1f0f9721c5c0e7f3c4
Auto-generated-cl: translation import
 2013-10-11 06:22:31 -07:00
Baligh Uddin a4557b064c am fbb89492: am 196ed028: (-s ours) am e03b75c0: (-s ours) am bc83cd0f: (-s ours) am b3073240: (-s ours) am 96a52175: (-s ours) am a0f6da5a: (-s ours) am a6c16790: (-s ours) am d7346f18: (-s ours) am bda32836: (-s ours) am 8e26b9c0: (-s ours) Import translations. DO N 
* commit 'fbb89492a1839a49d6627820456c963436864709':
 2013-10-10 01:14:21 -07:00
Baligh Uddin b7aae2df78 am 04931245: am a6d52095: (-s ours) am 09ff83d4: (-s ours) am 12a8e54e: (-s ours) am 07b83868: (-s ours) am 2159d77e: (-s ours) am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translation 
* commit '04931245183975bc3ff18b859252d6cb14f9454a':
 2013-10-10 00:44:26 -07:00
Ken Wakasa 1dcd6dc13c am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts."" 
* commit '9257c049672c278c08029d344c85baf183c6ff2e':
  Revert "Add Swiss French and German keyboard layouts."
 2013-10-09 19:32:55 -07:00
Ken Wakasa 56402cf10a Revert "Add Swiss French and German keyboard layouts." 
This reverts commit 220ce8f269.

Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.

Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
 2013-10-10 02:05:50 +00:00
Ken Wakasa a0797f459b am 064661a3: Merge "Add Swiss French and German keyboard layouts." 
* commit '064661a35cfb8223577d03e014f1ab61a5ba4575':
  Add Swiss French and German keyboard layouts.
 2013-10-09 15:16:04 -07:00
Fredrik Roubert 220ce8f269 Add Swiss French and German keyboard layouts. 
There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY,
available in LatinIME. They were, however, not actually Swiss layouts
but instead work-arounds to be able to get French or German with qwertz
or qwerty (instead of azerty and qwertz) layouts, respectively. These
were thus removed by commit f6972561fc
replacing them with the generic fr-qwertz and de-qwerty layouts instead.

Here, now, is a proper Swiss keyboard layout, following Swiss standards
for people accustomed to typing on Swiss keyboards, with the expected
tailorings for French and German.

Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
 2013-10-09 17:42:17 +02:00
Satoshi Kataoka 0a90c5a5b0 am 9a802e0d: Merge "Support sw540 (ultra Z)" 
* commit '9a802e0dba989f3fb8cb480355828531c8e1146d':
  Support sw540 (ultra Z)
 2013-10-09 01:55:37 -07:00
Satoshi Kataoka e55446b6bd Support sw540 (ultra Z) 
Bug: 11125351
Change-Id: Ib930ba810b25e28bcc36ea1647d46731816d9def
 2013-10-09 17:45:53 +09:00
Baligh Uddin d823988b53 Merge "Import translations. DO NOT MERGE" 2013-10-08 14:03:32 +00:00
Baligh Uddin 549559e28d Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-10-08 14:03:24 +00:00
Jean Chalard e9631bcda4 am 0152ff53: Merge "Update dictionaries" 
* commit '0152ff53a261e1b8dd2a876120480cc103b7a799':
  Update dictionaries
 2013-10-08 04:39:19 -07:00
Jean Chalard b1eedc6ba0 Update dictionaries 
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1381130519 <=> 1381226409
  version : 41 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1380293342 <=> 1381226409
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

>>> java/res/raw/main_en.dict
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> java/res/raw/main_fr.dict
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

Bug: 11114205
Change-Id: I39d429d24d93ee07a70d8613ce0752432b26acc4
 2013-10-08 10:34:56 +00:00
Jean Chalard 620017028c am 36c56cae: Merge "Make the sentence separator a resource." 
* commit '36c56caee3049737a55e2421bf9e3727c4936f24':
  Make the sentence separator a resource.
 2013-10-07 23:45:52 -07:00
Jean Chalard 10581e68af Make the sentence separator a resource. 
This will help handing correctly the armenian full stop.

Bug: 10082781
Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
 2013-10-08 15:28:43 +09:00
Baligh Uddin 03b4809729 Import translations. DO NOT MERGE 
Change-Id: If76652b1bdfc62f8c8d60ca8d5a8c3b7346e75a3
Auto-generated-cl: translation import
 2013-10-07 23:01:43 -07:00
Baligh Uddin 7cbd5d63fc Import translations. DO NOT MERGE 
Change-Id: I8dc4664964ed153fc79309d7e70f4a36bfacceb6
Auto-generated-cl: translation import
 2013-10-07 22:49:43 -07:00
Satoshi Kataoka 6a83a87569 am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view 
* commit '4746217247d14f26249217aab28215e9c6867614':
  Enter -> Alpha keyboard switcher in Emoji palette view
 2013-10-07 01:38:19 -07:00
Satoshi Kataoka 192414a4b1 am 32cf6f85: Show Emoji key by longpressing the enter key 
* commit '32cf6f85a2e166f8a43d9bccd4ddefa0b7167cd1':
  Show Emoji key by longpressing the enter key
 2013-10-07 01:38:17 -07:00
Satoshi Kataoka 4746217247 Enter -> Alpha keyboard switcher in Emoji palette view 
Bug: 11103091
Change-Id: I0c5384e9f148566d1ac1d178a8227eb913d59908
 2013-10-07 17:05:54 +09:00
Satoshi Kataoka 32cf6f85a2 Show Emoji key by longpressing the enter key 
Bug: 11074625
Change-Id: I5fc57a2b68d7dcfb8dbebf5821b76b0895a947f9
 2013-10-07 16:47:13 +09:00
Satoshi Kataoka b3ac25f1d9 am 4deb824f: Add navigateEmoji 
* commit '4deb824f3a91e2e157a3a0334e46b9bba394bc1a':
  Add navigateEmoji
 2013-10-06 23:35:34 -07:00
Satoshi Kataoka 4deb824f3a Add navigateEmoji 
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
 2013-10-07 15:28:39 +09:00
Satoshi Kataoka 6f726f6fff am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView 
* commit 'd76b55297940a65bb9479020a9ed58aa978a0aea':
  Rename EmojiKeyboardView -> EmojiPalettesView
 2013-10-06 20:35:15 -07:00
Satoshi Kataoka d76b552979 Rename EmojiKeyboardView -> EmojiPalettesView 
Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
 2013-10-07 12:28:13 +09:00
Baligh Uddin f96391aee0 Import translations. DO NOT MERGE 
Change-Id: I15036545751abe751f2768daef7f3f1605a5457e
Auto-generated-cl: translation import
 2013-10-04 22:59:25 -07:00
Baligh Uddin 4d4fe3eb5e Import translations. DO NOT MERGE 
Change-Id: I04aed3599ff9570197b408a5d16ea48422294f97
Auto-generated-cl: translation import
 2013-10-04 22:46:44 -07:00
Baligh Uddin a9a54bb4cd Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-10-04 16:55:51 +00:00
Baligh Uddin 2b361d95a6 Import translations. DO NOT MERGE 
Change-Id: I50e530351c75746759fefc4113c4f881755405ec
Auto-generated-cl: translation import
 2013-10-04 09:03:13 -07:00
Satoshi Kataoka 3bf2c59881 am 1d188a28: Merge "Fix emoji" 
* commit '1d188a28fb0930217098fef10937674e24ca5a49':
  Fix emoji
 2013-10-04 05:02:12 -07:00
Satoshi Kataoka 1d188a28fb Merge "Fix emoji" 2013-10-04 12:00:39 +00:00
Satoshi Kataoka 0cf92aa826 Fix emoji 
Bug: 10538430

Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
 2013-10-04 20:58:09 +09:00
Ken Wakasa f330de9526 am c01707db: Merge "Suppress exceptions that have always been happening." 
* commit 'c01707db03c124ecab0c8ba14b4e4f2d24c973c9':
  Suppress exceptions that have always been happening.
 2013-10-04 03:15:40 -07:00
Ken Wakasa fba1bd0ec4 Suppress exceptions that have always been happening. 
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
 2013-10-04 19:10:26 +09:00
Satoshi Kataoka 3944a67c32 am 6ec0cf12: Merge "Tentatively revert assets" 
* commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44':
  Tentatively revert assets
 2013-10-04 02:18:45 -07:00
Satoshi Kataoka 0b4d75c2fa Tentatively revert assets 
Change-Id: I403fc24a407fdd3b433d5820f1b46e6985cbe83e
 2013-10-04 18:09:03 +09:00
Satoshi Kataoka eb0526a9c3 am ef64676b: Merge "Revert emoji key position to JB-mr2" 
* commit 'ef64676bf8e843e0f5c3b8ed1ad409219da3493a':
  Revert emoji key position to JB-mr2
 2013-10-03 21:24:35 -07:00
Satoshi Kataoka ef64676bf8 Merge "Revert emoji key position to JB-mr2" 2013-10-04 02:30:26 +00:00
Satoshi Kataoka 5a54a5769c Revert emoji key position to JB-mr2 
Bug: 10538430

Change-Id: Ie2033b2f5253b2e2fc2229ba6c95568e7b2a58fa
 2013-10-04 11:21:51 +09:00
Alan Viverette f6c2a0fe59 am afa56511: Merge "Update string comments for translation" 
* commit 'afa565119cd3e8fd7f92ee22033932fc8e8d47d4':
  Update string comments for translation
 2013-10-03 13:37:51 -07:00
Alan Viverette afa565119c Merge "Update string comments for translation" 2013-10-03 20:34:24 +00:00
Satoshi Kataoka 3977cc9752 am c7f8d54d: Merge "Prepare for changing text color for functional keys" 
* commit 'c7f8d54d6eaa0a0ebfe156ebe426eeab080a82dc':
  Prepare for changing text color for functional keys
 2013-10-03 00:16:47 -07:00
Satoshi Kataoka c7f8d54d6e Merge "Prepare for changing text color for functional keys" 2013-10-03 07:15:03 +00:00