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

2825 Commits (205fb5a9062a10519b09c77512db011ee73c2b51)

Author SHA1 Message Date
Tadashi G. Takaoka 92f9f6e5d2 Tune key label size of Khmer keyboard using autoScale 
Bug: 11546184
Change-Id: I187b1e4205146f517c90de33aee9339d1d91f5b9
 2013-11-07 16:09:07 +09:00
Tadashi G. Takaoka 0ea72c8519 Separate action key labels to strings-action-keys.xml 
Bug: 11562208
Change-Id: I70390f9eafe51f16ff47b2e39454d1948a259469
 2013-11-07 15:12:55 +09:00
Tadashi G. Takaoka 1e1ffa7663 Update popup panel background a bit draker 
Bug: 11169026
Change-Id: I164ab69eb263f58000ffed7b7d97fc6b356147d5
 2013-11-06 18:57:50 +09:00
Tadashi G. Takaoka 78d2895c8d Remove unused vertical scrollable KeyboardView 
Bug: 11517736
Change-Id: I9d71290112c2306336e136c94b628b533e386aaa
 2013-11-05 19:15:20 +09:00
Baligh Uddin d075a7af41 Import translations. DO NOT MERGE 
Change-Id: I103b96a481208d2d3525dd57df2387e9c61b84a3
Auto-generated-cl: translation import
 2013-11-04 23:29:12 -08:00
Baligh Uddin 9bd2e4c7e7 Merge "Import translations. DO NOT MERGE" 2013-11-01 14:28:43 +00:00
Baligh Uddin 9e80ef32f2 Import translations. 
Cherry-picked from I83d28c60de84b09da48bd79aa9917f12bd850fdc

Change-Id: I55184cfd398bfe5c4a7dce8c41dd6ab60d5433d5
 2013-11-01 03:57:10 +00:00
Baligh Uddin fb0f805e93 Import translations. DO NOT MERGE 
Change-Id: Ic4bb5751c6ed8c07668f533604542c3fb1ef5909
Auto-generated-cl: translation import
 2013-10-28 23:49:13 -07:00
Baligh Uddin ea596c4f7c Import translations. DO NOT MERGE 
Change-Id: Ib8c870d0c974eb3b49ae29141aaa53e5f6a2cac9
Auto-generated-cl: translation import
 2013-10-28 23:45:03 -07:00
Baligh Uddin d1575a9d89 Import translations. DO NOT MERGE 
Change-Id: I9c2c9578bbc0a7036c7ee4c6b8a605ef90ae6001
Auto-generated-cl: translation import
 2013-10-25 14:43:14 -07:00
Baligh Uddin c9dea6d6c2 Import translations. DO NOT MERGE 
Change-Id: I9c4542106d4660da3b67907afa5696e91f537dd6
Auto-generated-cl: translation import
 2013-10-25 14:39:08 -07:00
Ken Wakasa 859b117118 Update Setup Wizard welcome video & image 
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
 2013-10-22 09:36:39 +09:00
Ken Wakasa 069d44c32c am 146cf238: DO NOT MERGE: Update input method subtype locales. 
* commit '146cf238792c4748aa726a440fb96a33b4260fa5':
  DO NOT MERGE: Update input method subtype locales.
 2013-10-18 11:18:26 -07:00
Ken Wakasa 146cf23879 DO NOT MERGE: Update input method subtype locales. 
To match up with the removal of obsolete locales.

cherrypick of I27098bfa26b66631ef412f8f0f72e0273a0161bc

bug: 11244796
Change-Id: I6e93513978ac657c859391d0431f90143d855e5f
 2013-10-18 17:09:24 +09:00
Ken Wakasa a62dc28121 Update input method subtype locales. 
To match up with the removal of obsolete locales.

bug: 11244796
Change-Id: I27098bfa26b66631ef412f8f0f72e0273a0161bc
 2013-10-18 16:44:38 +09:00
Satoshi Kataoka 27106487ba Remove unexpectedly used resources 
Change-Id: I0ddd1dfd54c76177660448d156a6c670f5579671
 2013-10-18 11:53:32 +09:00
Satoshi Kataoka b4b0a0507a am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev 
* commit '2e7f360a04f2a840fa083dde299d10e213de7bbb':
  Do not merge. Fix keyboard layout
 2013-10-17 17:44:47 -07:00
Satoshi Kataoka dcc33ab0fc am 141a0c33: Merge "Do not merge. Don\'t show long-pressing emoji key on tablet" into klp-dev 
* commit '141a0c33802d44a0b8b240b6b8415d465e0aa794':
  Do not merge. Don't show long-pressing emoji key on tablet
 2013-10-17 17:44:45 -07:00
Satoshi Kataoka 2e7f360a04 Merge "Do not merge. Fix keyboard layout" into klp-dev 2013-10-18 00:41:53 +00:00
Satoshi Kataoka 141a0c3380 Merge "Do not merge. Don't show long-pressing emoji key on tablet" into klp-dev 2013-10-18 00:41:42 +00:00
Baligh Uddin f4fd6017a0 am 8ccb79eb: am 66bdabad: am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory. 
* commit '8ccb79ebab1ece201da95866d2673e43752a949c':
  These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
 2013-10-17 14:40:24 -07:00
Baligh Uddin 66bdabad80 am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory. 
* commit 'e47f7332f9bb94905015061dd9791f43763ccab8':
  These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
 2013-10-17 11:26:35 -07:00
Baligh Uddin a7cebb8c5c am 486c5896: Remove obsolete locale directories. 
* commit '486c5896102cccfaa79d2109272ab7235dcacf38':
  Remove obsolete locale directories.
 2013-10-17 11:26:33 -07:00
Baligh Uddin e47f7332f9 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-17 11:22:07 -07:00
Baligh Uddin 486c589610 Remove obsolete locale directories. 
Bug: 11244796
 2013-10-17 11:15:33 -07:00
Baligh Uddin 765c40cd76 Merge "Import translations. DO NOT MERGE" 2013-10-17 15:47:22 +00:00
Baligh Uddin 38a2099808 Import translations. DO NOT MERGE 
Change-Id: Ibf795b67b9198d7357815db183d939ff703d064f
Auto-generated-cl: translation import
 2013-10-17 08:46:20 -07:00
Baligh Uddin 8d757c2052 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-17 15:45:30 +00:00
Baligh Uddin 9fa7efb0c5 Import translations. DO NOT MERGE 
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
 2013-10-17 08:40:51 -07:00
Satoshi Kataoka 329fd2d832 Do not merge. Don't show long-pressing emoji key on tablet 
Bug: 11264603
Change-Id: Ic46086e9f1b223e26586e0611d14a7d14b561100
 2013-10-17 20:38:33 +09:00
Satoshi Kataoka b2f5e0639f Don't show long-pressing emoji key on tablet 
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
 2013-10-17 17:53:33 +09:00
Satoshi Kataoka 8ff1e71f8a Do not merge. 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: I3797fe2ef8c1e4cbba3298475f01f90c98e3335f
 2013-10-17 17:29:45 +09:00
Satoshi Kataoka e2d531c0fd 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-17 16:37:26 +09:00
Satoshi Kataoka bfef552e62 am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev 
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
  Do not merge. Remove Azerbaijani subtype
 2013-10-16 14:22:41 -07:00
Satoshi Kataoka ea3db813cc Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev 2013-10-16 21:19:59 +00:00
Satoshi Kataoka 11384432bf Merge "Fix typo" 2013-10-16 09:42:08 +00:00
Satoshi Kataoka 22f67ff55e Fix typo 
Change-Id: I4748935c3cf00e4a3c02aabe2ea659e1c8c2d7c6
 2013-10-16 18:40:28 +09:00
Satoshi Kataoka 3dd33652e4 Do not merge. Remove Azerbaijani subtype 
The corresponding change is I0d2a98dffe03ebd

Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
 2013-10-16 18:39:59 +09:00
Satoshi Kataoka 612885f65b Merge "Cleanup unintentionally used resources" 2013-10-16 07:06:16 +00:00
Satoshi Kataoka af846af8bb Remove Azerbaijani subtype 
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
 2013-10-16 15:48:30 +09:00
Satoshi Kataoka ba9a428627 Cleanup unintentionally used resources 
bug: 11244796

Change-Id: I99be3d54d38f4cd70fc38f5e0b88b4027f62d579
 2013-10-16 14:44:50 +09:00
Ken Wakasa b067be0e5f Merge "Revert "Revert "Add Swiss French and German keyboard layouts.""" 2013-10-15 14:12:29 +00:00
Baligh Uddin 9e4210ba3a Import translations. DO NOT MERGE 
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
 2013-10-12 09:50:42 -07:00
Baligh Uddin cdc4c1dca7 Import translations. DO NOT MERGE 
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
 2013-10-12 09:43:32 -07:00
Baligh Uddin fc33cc6dba Import translations. DO NOT MERGE 
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
 2013-10-11 06:35:24 -07:00
Baligh Uddin 02ecae3aa3 Import translations. DO NOT MERGE 
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
 2013-10-11 06:31:03 -07:00
Satoshi Kataoka 49d8b8cacd am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE 
* commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b':
  Support sw540 (ultra Z). DO NOT MERGE
 2013-10-09 21:25:47 -07:00
Jean Chalard 718952855b am e9631bcd: am 0152ff53: Merge "Update dictionaries" 
* commit 'e9631bcda47b482dee5a17d87b82a39f4a2e3104':
  Update dictionaries
 2013-10-09 21:00:21 -07:00
Jean Chalard 9af393140e am 62001702: am 36c56cae: Merge "Make the sentence separator a resource." 
* commit '620017028cd1ef7159c16343720e7062b09dc3ba':
  Make the sentence separator a resource.
 2013-10-09 21:00:04 -07:00
Satoshi Kataoka 9eb2acc7e5 am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view 
* commit '6a83a87569dba536f47e61cff0e15437c85c5595':
  Enter -> Alpha keyboard switcher in Emoji palette view
 2013-10-09 20:59:33 -07:00
Satoshi Kataoka dd53038e4e am 192414a4: am 32cf6f85: Show Emoji key by longpressing the enter key 
* commit '192414a4b1e95668fcba1c302cdf5b4d7ff8f9e5':
  Show Emoji key by longpressing the enter key
 2013-10-09 20:59:31 -07:00
Satoshi Kataoka 72facc170b am b3ac25f1: am 4deb824f: Add navigateEmoji 
* commit 'b3ac25f1d9150ab47fd1184515ec5a8b39290451':
  Add navigateEmoji
 2013-10-09 20:59:29 -07:00
Satoshi Kataoka 53e60a5e1c am 6f726f6f: am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView 
* commit '6f726f6fffb7cbd305a2707fab50f67afb183420':
  Rename EmojiKeyboardView -> EmojiPalettesView
 2013-10-09 20:59:22 -07:00
Satoshi Kataoka c8e4ad0748 Support sw540 (ultra Z). DO NOT MERGE 
cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def

Bug: 11125351
Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
 2013-10-10 11:33:10 +09:00
Ken Wakasa 856b06a3ac Revert "Revert "Add Swiss French and German keyboard layouts."" 
This reverts commit 56402cf10a.

I'll submit this on 10/16 after the final cut for Bayo.

Change-Id: I0fe4ab64fd8dfa1e63e29adf00388743fca6a1ed
bug: 11144401
 2013-10-10 02:07:04 +00: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
Satoshi Kataoka f12df9e401 am 3bf2c598: am 1d188a28: Merge "Fix emoji" 
* commit '3bf2c59881ebdd4cf77099806d26f280046623bf':
  Fix emoji
 2013-10-09 18:55:00 -07:00
Ken Wakasa d439ee371d am f330de95: am c01707db: Merge "Suppress exceptions that have always been happening." 
* commit 'f330de9526025448e64bdfe69b3d277e214c2512':
  Suppress exceptions that have always been happening.
 2013-10-09 18:54:53 -07:00
Satoshi Kataoka 0f0cd69aa8 am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets" 
* commit '3944a67c325478341be43a97017db0c50746c17c':
  Tentatively revert assets
 2013-10-09 18:54:45 -07:00
Alan Viverette 26c006d8f0 am f6c2a0fe: am afa56511: Merge "Update string comments for translation" 
* commit 'f6c2a0fe59444eb85a7e658ce36bf40edd8605da':
  Update string comments for translation
 2013-10-09 17:55:51 -07:00
Satoshi Kataoka 26a97909f6 am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys" 
* commit '3977cc97528df0851d9b671578181d64c6b7a210':
  Prepare for changing text color for functional keys
 2013-10-09 17:55:25 -07:00
Satoshi Kataoka 2e7f74f00c am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s" 
* commit '615509cf27839e946280787cf27d8c091079b91b':
  Unfortunately, hide some broken "emoji"s
 2013-10-09 17:54:01 -07:00
Ken Wakasa 3dd8185656 am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones" 
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
  Cleanup and remove redundant more keys on phones
 2013-10-09 17:53:49 -07:00
Ken Wakasa 272a8b79d8 am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma." 
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
  Swap keys: exclamation, question, period, comma.
 2013-10-09 17:53:47 -07:00
Satoshi Kataoka acdd67bb42 am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets 
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
  Tentatively revert inconsistent assets
 2013-10-09 17:53:39 -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 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
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
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 f4aa9a7bd7 Do not merge. Revert emoji key position to JB-mr2 
Cherry pick of Ie2033b2f5253b2e2

Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
 2013-10-04 16:38:54 +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