Commit graph

11696 commits

Author SHA1 Message Date
Jean Chalard
8cd5326622 [ML7] Have multiple DictionaryGroup instances in facilitator
This is the central change of multilingual input.

Bug: 11230254
Change-Id: Id8b68fb101e837e8cf182ab4bc1e55e4da5cc49d
2014-09-16 19:00:50 +09:00
Tadashi G. Takaoka
dad7a5dffd Fix drawing of custom action label key
Bug: 17488054
Change-Id: I433561ed19ec2a79402867a0395a3e388730f087
2014-09-16 18:21:49 +09:00
Sandeep Siddhartha
e143f5b1fe Merge "Initial split QWERTY layout" 2014-09-16 03:06:00 +00:00
Sandeep Siddhartha
23f38149c6 Merge "Add a canSplitKeyboard attribute for specifying split keyboard layouts" 2014-09-16 03:05:46 +00:00
Baligh Uddin
9dafca38d6 Import translations. DO NOT MERGE
Change-Id: I410c187d99e2896703b7c76079bc1782519d10f0
Auto-generated-cl: translation import
2014-09-15 00:20:16 -07:00
Baligh Uddin
55cb1e0e4d Import translations. DO NOT MERGE
Change-Id: Id5c9da5464884357ba3c087c10820b6b84e15ae5
Auto-generated-cl: translation import
2014-09-15 00:19:02 -07:00
Baligh Uddin
4d56a5fe5f Import translations. DO NOT MERGE
Change-Id: Id7999e5ed1331e8fc0260c2e529df116bc0661ef
Auto-generated-cl: translation import
2014-09-15 00:16:06 -07:00
Baligh Uddin
f428a22566 Import translations. DO NOT MERGE
Change-Id: I2f3eded792bf3882ae4cd16a0a97933f77bc5ce2
Auto-generated-cl: translation import
2014-09-15 00:15:16 -07:00
Baligh Uddin
accfe85b59 Import translations. DO NOT MERGE
Change-Id: I0cea5e4fa1120dcce3bf5d5dfd5667167271ef5e
Auto-generated-cl: translation import
2014-09-15 00:14:38 -07:00
Baligh Uddin
a7e2d9da19 Import translations. DO NOT MERGE
Change-Id: I9e292160719ac6b4bf617263525d3f00acc9cd87
Auto-generated-cl: translation import
2014-09-15 00:13:58 -07:00
Baligh Uddin
bf69809aab Import translations. DO NOT MERGE
Change-Id: I893b13ee353d4ce57b34bf8ca4e0e3a5ddc0b068
Auto-generated-cl: translation import
2014-09-15 00:12:39 -07:00
Tadashi G. Takaoka
1947a6017c am add81661: am 001df4bf: am 5b9a1e59: Fix key preview popup for Material theme
* commit 'add816610b0d2978c5bd2653e53444f65d812ecf':
  Fix key preview popup for Material theme
2014-09-14 10:38:51 +00:00
Tadashi G. Takaoka
001df4bf54 am 5b9a1e59: Fix key preview popup for Material theme
* commit '5b9a1e59bb7434cce740616c64e274a130a66ee6':
  Fix key preview popup for Material theme
2014-09-14 10:10:31 +00:00
Tadashi G. Takaoka
5b9a1e59bb Fix key preview popup for Material theme
This CL also removes unused key preview resources for Tablet.

Bug: 15143928
Change-Id: Icbf4f7b6d5c7839b4fe7a27d320a2184f0625130
2014-09-14 10:48:48 +09:00
Tadashi G. Takaoka
ee3e84e59e am 463c1880: am e458949c: am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev
* commit '463c1880a12708a3013e87ae262ee8e69be15f48':
  Tune keyboard height and letter size of tablet
2014-09-13 22:47:36 +00:00
Tadashi G. Takaoka
e458949cf8 am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev
* commit '941531b26eb0d95028357ab5615e89227cf84de6':
  Tune keyboard height and letter size of tablet
2014-09-13 22:16:27 +00:00
Tadashi G. Takaoka
941531b26e Merge "Tune keyboard height and letter size of tablet" into lmp-dev 2014-09-13 22:00:23 +00:00
Ken Wakasa
1514844b2f am 060f4b94: am bd3a7c4e: am 991571ff: Wording update for settings.
* commit '060f4b945127f0b4aae2fcbf13a20210290248c4':
  Wording update for settings.
2014-09-13 12:43:25 +00:00
Tadashi G. Takaoka
ef7124b6fd Tune keyboard height and letter size of tablet
The height of Google Keyboard is limited by maximum and minimum ratio
to the display height.  Because screen aspect ratio of some large
tablet is close to 1:1, the height of the keyboard may become taller
than expected. This CL lowers the minimum ratio to allow shorter
height. This CL also increase text size of Material theme keyboard on
tablet as well.

Bug: 17050390
Change-Id: I87c5f49ce554950c525a1f31dfddfd1beb3fafda
2014-09-13 21:12:52 +09:00
Ken Wakasa
bd3a7c4ecb am 991571ff: Wording update for settings.
* commit '991571ff456ebe181489f8dbb737fce941d6a78c':
  Wording update for settings.
2014-09-13 12:12:01 +00:00
Ken Wakasa
991571ff45 Wording update for settings.
"Appearance" -> "Appearance & layouts".

bug: 11866784
Change-Id: I9843b76cadb0245973cec07134d07212c8c5667e
2014-09-13 20:02:23 +09:00
Jatin Matani
9b140f4e4f am 4d8efc97: am b41d1fcd: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev
* commit '4d8efc97873d12b4596c695fbcf7e72330b5253e':
  Reorganize settings in Google Keyboard
2014-09-13 02:12:24 +00:00
Ken Wakasa
64176158e7 resolved conflicts for merge of 75513e51 to master
Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425
2014-09-13 10:41:19 +09:00
Ken Wakasa
8ed81f9fd7 resolved conflicts for merge of 8e9385cc to master
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
2014-09-13 09:25:23 +09:00
Tadashi G. Takaoka
d190b8c521 am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev
* commit 'c24340f956c16d8594c44d45685f8a814538245b':
  Update AOSP launcher icon
2014-09-12 19:16:40 +00:00
Tadashi G. Takaoka
3ecae3d37f am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assets
* commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
  Add xxxhdpi assets
2014-09-12 19:16:33 +00:00
Jatin Matani
b41d1fcd98 am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev
* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
  Reorganize settings in Google Keyboard
2014-09-12 18:51:03 +00:00
Tadashi G. Takaoka
ca9c061c41 am fd5f2b91: Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev
* commit 'fd5f2b91fdb67921edf3d9071557d013fa498386':
  Fix not always showing input view with physical keyboard connected
2014-09-12 18:51:02 +00:00
Jean Chalard
567c0dd471 am 7aa47cb3: Only do double-space-period on real text fields.
* commit '7aa47cb3748d82b6f8bf3713c3c9e05b3fca8979':
  Only do double-space-period on real text fields.
2014-09-12 18:51:00 +00:00
Sandeep Siddhartha
9c31e8f863 Initial split QWERTY layout
Change [2/3]

Add an attribute that's used in layout xmls for specifying
the split-keyboard layout.
This attribute will be checked/set by the KeyboardBuilder which knows about
the "splittability" of the keyboard.

Bug: 4968173
Change-Id: I5d792e570b9648e09022e9b7e92a972a161009ee
2014-09-12 18:46:27 +09:00
Sandeep Siddhartha
3939455c1d Add a canSplitKeyboard attribute for specifying split keyboard layouts
Change [1/3]

This'll be used in conjunction with a user preference to split the keyboard when possible.

Bug: 4968173
Change-Id: I7a05948d67b94a55024790115ae261d7fef7941a
2014-09-12 18:46:14 +09:00
Jatin Matani
d0d8f90a32 Merge "Reorganize settings in Google Keyboard" into lmp-dev 2014-09-12 09:12:01 +00:00
Tadashi G. Takaoka
fd5f2b91fd Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev 2014-09-12 09:02:31 +00:00
Tadashi G. Takaoka
3a90cb9ad0 Reorganize settings in Google Keyboard
Changes :
Input languages ->  Languages
Input preferences -> Preferences
Multi lingual Options -> Multilingual Options
Keyboard Theme -> Theme
Gesture typing preferences -> Gesture typing

**New
 Appearance
        -> Theme
        -> Custom input style

**Removed
 Multilingual options from L dynamically

Bug: 11866784
Change-Id: I07404c27868e1b087b0cafb63d2031a5b493a885
2014-09-12 02:00:26 -07:00
Jean Chalard
7aa47cb374 Only do double-space-period on real text fields.
Bug: 15559216
Change-Id: Id6ecadc58c03889496967d67371457e4050d695b
2014-09-12 17:49:47 +09:00
Tadashi G. Takaoka
88f282de0d Fix not always showing input view with physical keyboard connected
Bug: 17163374
Change-Id: I57f7eeac0c9ac0a15d3d55927e18a2d97849c508
2014-09-12 17:45:35 +09:00
Yohei Yukawa
97b465044f am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen mode
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
  Support CursorAnchorInfo in the full-screen mode
2014-09-11 17:31:47 +00:00
Baligh Uddin
64dd48e381 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 17:21:01 +00:00
Baligh Uddin
ee54c35bad Merge "Import translations. DO NOT MERGE" 2014-09-11 17:20:58 +00:00
Tadashi G. Takaoka
74d59ccae1 am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev
* commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed':
  Update AOSP launcher icon
2014-09-11 15:38:55 +00:00
Tadashi G. Takaoka
1bb20aa0cf am 31544dcb: Add xxxhdpi assets
* commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c':
  Add xxxhdpi assets
2014-09-11 15:38:54 +00:00
Tadashi G. Takaoka
dc1097ee2e Merge "Update AOSP launcher icon" into lmp-dev 2014-09-11 15:28:53 +00:00
Tadashi G. Takaoka
ed9e100449 Update AOSP launcher icon
Bug: 16635354
Bug: 16635354
Change-Id: I68f9c4ec21a01b9db0fc73c1785c972f5d7ac05b
2014-09-12 00:25:43 +09:00
Tadashi G. Takaoka
31544dcb43 Add xxxhdpi assets
Bug: 17432407
Change-Id: I68e5f660425db567688d4e119c94fc34430f8ff3
2014-09-11 15:09:30 +00:00
Jean Chalard
96f0ae5e68 [ML6] Have asyncReloadMainDictionary support multiple locales
Change-Id: I4c3dfaad38ec1cc91d1a9f81d5ff45ef12f70029
2014-09-11 19:05:22 +09:00
Jean Chalard
e6df5f015c [ML5] Rewrite resetDictionariesWithDictNamePrefix
This change rewrites resetDictionariesWithDictNamePrefix so
that it would work if there were several locales, which is going to
happen shortly. This change on its own is quite large and difficult
already, so I didn't want to merge it into the change that actually
makes several locales happen; another such change is following.

Change-Id: Ibb80b05b73c0f0f0bea64b7e308cc4d38ca448f9
2014-09-11 19:05:19 +09:00
Yohei Yukawa
27ccbeb4e6 am cd119050: Support CursorAnchorInfo in the full-screen mode
* commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9':
  Support CursorAnchorInfo in the full-screen mode
2014-09-11 09:54:42 +00:00
Yohei Yukawa
cd11905022 Support CursorAnchorInfo in the full-screen mode
This CL allows to emulate the behavior of CursorAnchorInfo
in the full-screen mode to work around the limitation of
the framework.

Basically this CL copies relevant code from the framework
to LatinIME. This is actually a code duplicate which isn't
great, but probably the only way that is available right now.

Change-Id: I30bc8c3387c91c8e47252ba699cbd967d8927dad
2014-09-11 18:36:53 +09:00
Jatin Matani
fd96928175 Merge "Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView" 2014-09-11 03:14:57 +00:00
Keisuke Kuroyanagi
af1a06d7e1 Enable personalization for multilingual users.
Bug: 16547557
Change-Id: I03eda34edc902fc4732d16d234216344d8d84d88
2014-09-10 18:23:09 +09:00
Keisuke Kuroyanagi
89e34169f8 Get locale using detected language for personalization.
Bug: 16547557
Change-Id: If3d88a548e5a2255ff81c819b056f77bfbe237ae
2014-09-10 18:23:07 +09:00
Jatin Matani
1c45f9142b Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView
Change-Id: I4e7dc008b98e398c38aafea5cb31156dde7f42ea
2014-09-10 15:55:15 +09:00
Mohammadinamul Sheik
97243cea28 Merge "Add backspace event methods to StatsUtils" 2014-09-10 04:56:23 +00:00
Keisuke Kuroyanagi
934e1d8087 Merge "Move case and OOV detection logic into distracter filter." 2014-09-10 03:49:10 +00:00
Keisuke Kuroyanagi
d843081193 Move case and OOV detection logic into distracter filter.
Bug: 16547557

Change-Id: I8502585976deb5e93fff3b1e0266654b8a927bda
2014-09-10 11:25:34 +09:00
Mohammadinamul Sheik
acdd2e4572 Add backspace event methods to StatsUtils
Change-Id: Id45d217073e49ca5f2ba639b608d168d136bba58
2014-09-10 10:54:49 +09:00
Tadashi G. Takaoka
63ee10d63a am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
  Keep aspect ratio of Material action key background
2014-09-09 15:03:15 +00:00
Baligh Uddin
b575170e64 Import translations. DO NOT MERGE
Change-Id: Id31c38a0c1c737071e3659fc374eaca40f441102
Auto-generated-cl: translation import
2014-09-09 04:23:48 -07:00
Baligh Uddin
02729904ab Import translations. DO NOT MERGE
Change-Id: I760fae2840e78c7dce10f6caf9cae4fffdef71c1
Auto-generated-cl: translation import
2014-09-09 04:20:58 -07:00
Tadashi G. Takaoka
12814352dd am 486c4894: Keep aspect ratio of Material action key background
* commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b':
  Keep aspect ratio of Material action key background
2014-09-09 06:19:02 +00:00
Tadashi G. Takaoka
486c4894ce Keep aspect ratio of Material action key background
Bug: 15681452
Change-Id: Ie4b823dca541b76b68cade580845a21ff0b21e2f
2014-09-09 14:28:46 +09:00
Jean Chalard
ef0ef2d0b9 am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W keyboard
* commit 'beb746103011149d6dfce10278475946e679263d':
  Don't resume suggestions with H/W keyboard
2014-09-08 13:52:25 +00:00
Jean Chalard
7140035932 Fix a missing initialization
Change-Id: I14a35f5a38b6e0f48c95cbb8c0c6e4507cd61fa7
2014-09-08 22:40:36 +09:00
Jean Chalard
ab18b5f1f7 am 9395014e: Don\'t resume suggestions with H/W keyboard
* commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d':
  Don't resume suggestions with H/W keyboard
2014-09-08 13:29:55 +00:00
Jean Chalard
1cf2acd8de am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
  Fix a bug where recorrection would stop on connectors
2014-09-08 13:20:27 +00:00
Jean Chalard
9395014e76 Don't resume suggestions with H/W keyboard
...unless we do support a hardware keyboard, which we still
do not at the moment.

Change-Id: Iec24b1ae8ba5e23e0bbb7e5a468b7404296d4b18
2014-09-08 22:14:02 +09:00
Jean Chalard
0eaa25e0b3 am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '914078fd9198aeb3d7ffa034562321d688d588f7':
  Fix a bug where recorrection would stop on connectors
2014-09-08 12:59:23 +00:00
Jean Chalard
b41ee67194 Fix the sentence separator for Hindi.
Change-Id: I623e4ccbc324751eb67ec4bb777e2be5ae2a60d1
Bug: 17418371
2014-09-08 21:54:28 +09:00
Jean Chalard
914078fd91 Fix a bug where recorrection would stop on connectors
Bug: 16733686
Change-Id: I7a9f79a81e33a1f5bf5f3daf0b78d0f1e4447e7a
2014-09-08 21:47:01 +09:00
Tadashi G. Takaoka
c106efa7cd am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
* commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
  Mark isDefault="true" for all supported subtypes
2014-09-08 10:25:14 +00:00
Tadashi G. Takaoka
56c7ceb47d am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
* commit '42665f0ee26407fae984446b306309376aac2b36':
  Mark isDefault="true" for all supported subtypes
2014-09-08 10:05:34 +00:00
Tadashi G. Takaoka
42665f0ee2 Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 2014-09-08 09:56:25 +00:00
Yohei Yukawa
a48fe12b9c am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
* commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
  Follow up API signature changes of CursorAnchorInfo
2014-09-08 09:35:00 +00:00
Jean Chalard
653546a618 am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-dev
* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
  Resolve an old TODO.
2014-09-08 09:34:58 +00:00
Yohei Yukawa
f930ce1261 am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
* commit '1caa0b714dc49c8723d36d4d9825427f8978a602':
  Follow up API signature changes of CursorAnchorInfo
2014-09-08 09:18:14 +00:00
Jean Chalard
1f74ba178b am cb077f75: Merge "Resolve an old TODO." into lmp-dev
* commit 'cb077f75ac750d50c305ac5da20d81df5003907a':
  Resolve an old TODO.
2014-09-08 09:18:13 +00:00
Yohei Yukawa
b9bd524b58 am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
* commit 'c1ee88572232235d5972220ec1e5232de58a916e':
  Revert "Use right arrow for the commit indicator"
2014-09-08 09:17:31 +00:00
Tadashi G. Takaoka
5314e5c38c Mark isDefault="true" for all supported subtypes
Bug: 17381393
Change-Id: I3a2852c76d6f3dda551529673e7d4e957ced53ca
2014-09-08 18:14:51 +09:00
Yohei Yukawa
1caa0b714d Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 2014-09-08 09:11:41 +00:00
Jean Chalard
a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00:00
Jean Chalard
cb077f75ac Merge "Resolve an old TODO." into lmp-dev 2014-09-08 08:57:23 +00:00
Yohei Yukawa
a8ecd29646 Follow up API signature changes of CursorAnchorInfo
This is a follow up CL for Ic8c6fab58c01206872a34e7ee604cdda.

No behavior change is intended in this CL.

BUG: 17365414
BUG: 17335734
Change-Id: I4299536d0cb0c660b7b564653c72c9cb409a7aa5
2014-09-08 17:07:34 +09:00
Yohei Yukawa
a6c53d31fd am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
* commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e':
  Revert "Use right arrow for the commit indicator"
2014-09-08 07:58:01 +00:00
Yohei Yukawa
257dfa79f7 Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 2014-09-08 07:49:22 +00:00
Yohei Yukawa
b915753a07 Revert "Use right arrow for the commit indicator"
This reverts commit 2412d9ae3c.

Change-Id: Ie8090735850e2f2d075d0bdaf3ef628d866b5514
2014-09-08 07:46:11 +00:00
Mohammadinamul Sheik
74332597d6 Merge "Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf." 2014-09-08 06:52:02 +00:00
Jean Chalard
b526a894db Fix a bug with the Greek question mark.
Bug: 17398284
Change-Id: If49593e2c959935a183a4cd9d988407cc1160599
2014-09-08 15:33:51 +09:00
Tadashi G. Takaoka
100a8aec5b am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard
* commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
  Implement Floating Action Button more keys keyboard
2014-09-08 06:07:52 +00:00
Tadashi G. Takaoka
9ca6658e9a am 0f33e614: Implement Floating Action Button more keys keyboard
* commit '0f33e614c0799fa3a14a2c32db4bf0654df039da':
  Implement Floating Action Button more keys keyboard
2014-09-08 05:48:19 +00:00
Tadashi G. Takaoka
e1b10aedd7 am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardView
* commit '3aabf655d0125fb824e5e47687f5084b2df6979c':
  Move more keys divider to MoreKeysKeyboardView
2014-09-08 05:42:32 +00:00
Tadashi G. Takaoka
0f33e614c0 Implement Floating Action Button more keys keyboard
Bug: 15681452
Change-Id: I8484e4fe4d989b391f2b5230836dc9dfac218429
2014-09-08 14:34:33 +09:00
Tadashi G. Takaoka
f21c77d7b7 am 727e818e: Move more keys divider to MoreKeysKeyboardView
* commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8':
  Move more keys divider to MoreKeysKeyboardView
2014-09-08 05:24:19 +00:00
Mohammadinamul Sheik
c74ffe8edc Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf.
Change-Id: I1588448154d086569cb026825fdc36cd1812a582
2014-09-07 20:43:48 -07:00
Tadashi G. Takaoka
727e818e95 Move more keys divider to MoreKeysKeyboardView
Bug: 15681452
Change-Id: I1b32719cc927a24db4c41fdeb812b39f7e98a85c
2014-09-08 11:02:07 +09:00
Tadashi G. Takaoka
8b7ed7f6c6 am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev
* commit '079f9c3f5ae7b2f7926321522b6020affd422b52':
  Create donottranslate debug settings string resources file
2014-09-05 17:23:45 +00:00
Tadashi G. Takaoka
6e259d560e am 82c8696f: am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev
* commit '82c8696f526d3ab121a7e8d188acf30ce6ae8e9c':
  Refactor action label/icon definitions
2014-09-05 17:23:44 +00:00
Tadashi G. Takaoka
1b43021949 am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev
* commit '6888ec009951ffd900c04a0ad179a94d47eca03c':
  Create donottranslate debug settings string resources file
2014-09-05 15:37:02 +00:00
Tadashi G. Takaoka
c7b8858ec1 am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev
* commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839':
  Refactor action label/icon definitions
2014-09-05 15:37:01 +00:00
Jean Chalard
6bb6d30344 Resolve an old TODO.
This is cleaner.

Bug: 17347779
Change-Id: I5b612783b1ec98a1a11401f00d68db49654f3023
2014-09-05 20:10:29 +09:00
Jean Chalard
46d111ff4a Merge "Fix a bug where CAPS_WORDS would not be returned." 2014-09-05 09:53:51 +00:00