Commit Graph

3679 Commits (ad235ceb86876d846dcee6c7fa5a90fe2dc37e23)

Author SHA1 Message Date
Tadashi G. Takaoka 53e5cbbbfe am 7d64bc34: Merge "Revert "Revert "Fall back to default keyboard theme"""
* commit '7d64bc34550e68a2cba502f01d7a8a978a41243b':
  Revert "Revert "Fall back to default keyboard theme""
2014-09-17 11:54:51 +00:00
Tadashi G. Takaoka dc3a61ebfb am c6cc0008: Merge "Revert "Fall back to default keyboard theme""
* commit 'c6cc0008922a93d2a320761f97d7758daca0e903':
  Revert "Fall back to default keyboard theme"
2014-09-17 11:54:50 +00:00
Tadashi G. Takaoka 311f12d024 Revert "Revert "Fall back to default keyboard theme""
This reverts commit 821486ba8b.

Change-Id: If0285c87edcd5f7d3c5449026953a74bf1125f65
2014-09-17 11:51:09 +00:00
Tadashi G. Takaoka 821486ba8b Revert "Fall back to default keyboard theme"
This reverts commit 6ed8b18326.

Change-Id: I48f775e54f4077e556b26bc0146bc918421c6845
2014-09-17 11:46:40 +00:00
Tadashi G. Takaoka 686136a4ef am e2a396ee: Merge "Fall back to default keyboard theme"
* commit 'e2a396eef0a68903018a4c578604acc8a1c252db':
  Fall back to default keyboard theme
2014-09-17 11:34:25 +00:00
Tadashi G. Takaoka 6ed8b18326 Fall back to default keyboard theme
Bug: 17537884
Change-Id: I3452d6d4a5837c6b2d417c8d256c121df86131cc
2014-09-17 19:36:22 +09:00
Baligh Uddin 590030f848 Import translations. DO NOT MERGE
Change-Id: I19678ff53253183c07406b0ece6f169a46f81457
Auto-generated-cl: translation import
2014-09-17 02:12:04 -07:00
Baligh Uddin 3f50ccf29c Import translations. DO NOT MERGE
Change-Id: I3dfaab576c0c3aad47e186a2a9d2c5b4a4706594
Auto-generated-cl: translation import
2014-09-17 02:09:42 -07:00
Baligh Uddin 61e71159ef Import translations. DO NOT MERGE
Change-Id: I334aad8a01be6ed8fd0b749e68a5bf82a769441d
Auto-generated-cl: translation import
2014-09-17 02:03:35 -07:00
Baligh Uddin 36125d132f Import translations. DO NOT MERGE
Change-Id: I5ee3f71942e7ee089d0bdff0264c05956f73a190
Auto-generated-cl: translation import
2014-09-17 02:01:03 -07:00
Baligh Uddin 1c28a6a2c0 Import translations. DO NOT MERGE
Change-Id: I2152337de34905215926f0e774d587f8b1bc36b5
Auto-generated-cl: translation import
2014-09-17 01:59:49 -07:00
Baligh Uddin 196f29339d Import translations. DO NOT MERGE
Change-Id: Id7ca3e11bc5e49a1d6f32a573c983c7aaf029210
Auto-generated-cl: translation import
2014-09-17 01:58:26 -07:00
Jatin Matani a5d4cb7769 Add a user preference for split layout within Appearance & Layouts
Note The preference is flag protected.

Change-Id: I1be219ba961f002897b7b13ff9f200e2f142b2d8
2014-09-16 23:27:01 -07:00
Baligh Uddin 81c1daa9da Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:09 +00:00
Baligh Uddin b979cd5415 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:05 +00:00
Baligh Uddin aaddee7010 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:03 +00:00
Baligh Uddin 771a3a7d3a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:01 +00:00
Baligh Uddin d5937725fc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:48:59 +00:00
Baligh Uddin 73cbb9816a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:48:57 +00:00
Sandeep Siddhartha 5ea456ee57 am e143f5b1: Merge "Initial split QWERTY layout"
* commit 'e143f5b1fe86043027d34fca77b49ad677a1e5e0':
  Initial split QWERTY layout
2014-09-16 08:39:41 +00:00
Sandeep Siddhartha cd25535929 am 23f38149: Merge "Add a canSplitKeyboard attribute for specifying split keyboard layouts"
* commit '23f38149c6d83e10f9b60fa1e6653f421df3f539':
  Add a canSplitKeyboard attribute for specifying split keyboard layouts
2014-09-16 08:39:40 +00: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 84cd3fca6b am 1947a601: am add81661: am 001df4bf: am 5b9a1e59: Fix key preview popup for Material theme
* commit '1947a6017c6721556800015a2e1a218709f622da':
  Fix key preview popup for Material theme
2014-09-14 10:51:20 +00: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 7be713e683 am ee3e84e5: am 463c1880: am e458949c: am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev
* commit 'ee3e84e59eff9ca246ac4d9ee645f69b2affcf85':
  Tune keyboard height and letter size of tablet
2014-09-13 23:01:44 +00: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 e35c933260 am 1514844b: am 060f4b94: am bd3a7c4e: am 991571ff: Wording update for settings.
* commit '1514844b2f74e41d8e16e055d9009e6a8831f0f2':
  Wording update for settings.
2014-09-13 12:58:07 +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 31ce2cc1db am 9b140f4e: am 4d8efc97: am b41d1fcd: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev
* commit '9b140f4e4f67c6598d9ae975bbbb536df8f06053':
  Reorganize settings in Google Keyboard
2014-09-13 02:45:38 +00: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
Tadashi G. Takaoka faa13e8290 am d190b8c5: am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev
* commit 'd190b8c52169cf89865885a4f3d837ce2b3c2444':
  Update AOSP launcher icon
2014-09-12 19:46:36 +00:00
Tadashi G. Takaoka 400e82bc6f am 3ecae3d3: am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assets
* commit '3ecae3d37fea1939ea1748e492282d2f1329a2cb':
  Add xxxhdpi assets
2014-09-12 19:46:34 +00: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
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
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
Baligh Uddin 23b884208d Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-09-11 17:21:03 +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
Tadashi G. Takaoka 0198674ded am 63ee10d6: am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit '63ee10d63a67fd8e2de3047c4a8de1dbac0c9fc1':
  Keep aspect ratio of Material action key background
2014-09-09 15:16:49 +00: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
Baligh Uddin 74f95356a0 Import translations. DO NOT MERGE
Change-Id: I55f98af1c1d261d2f6b477439ac7692a52415b0c
Auto-generated-cl: translation import
2014-09-09 04:18:04 -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 93770226da am b41ee671: Fix the sentence separator for Hindi.
* commit 'b41ee671944aee97163c1567d7407fc3bd7507a3':
  Fix the sentence separator for Hindi.
2014-09-08 13:15:12 +00:00
Jean Chalard b41ee67194 Fix the sentence separator for Hindi.
Change-Id: I623e4ccbc324751eb67ec4bb777e2be5ae2a60d1
Bug: 17418371
2014-09-08 21:54:28 +09:00
Tadashi G. Takaoka 1ae250483a am c106efa7: am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
* commit 'c106efa7cd6a6fad3a45ff42f49a54b8a370587f':
  Mark isDefault="true" for all supported subtypes
2014-09-08 10:33:39 +00: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 9c576fcba5 am b9bd524b: am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
* commit 'b9bd524b58084872f6607c9b81296f0685ba95b3':
  Revert "Use right arrow for the commit indicator"
2014-09-08 09:24:29 +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
Jean Chalard 81bbadb806 am a1d23154: Merge "Fix a bug with the Greek question mark."
* commit 'a1d23154992fbda9b3f035dc99132ed48f21f517':
  Fix a bug with the Greek question mark.
2014-09-08 09:14:30 +00:00
Jean Chalard a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00: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
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 9915aea6f1 am 100a8aec: am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard
* commit '100a8aec5bb3851f9d0a7c5921d4ea44fbdbdcc2':
  Implement Floating Action Button more keys keyboard
2014-09-08 06:17:03 +00: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 af4f922684 am e1b10aed: am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardView
* commit 'e1b10aedd7af94c18b1c98d688c1b279eba42d5c':
  Move more keys divider to MoreKeysKeyboardView
2014-09-08 05:47:35 +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
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 9e03768ad8 am 8b7ed7f6: am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev
* commit '8b7ed7f6c65f2f577d1c4e83624a6ca9d7290c25':
  Create donottranslate debug settings string resources file
2014-09-05 17:36:13 +00:00
Tadashi G. Takaoka cd61c4b808 am 6e259d56: am 82c8696f: am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev
* commit '6e259d560e68efdc088d7c052fb2061ffdbbe508':
  Refactor action label/icon definitions
2014-09-05 17:36:12 +00: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
Tadashi G. Takaoka 6888ec0099 Merge "Create donottranslate debug settings string resources file" into lmp-dev 2014-09-05 08:29:35 +00:00
Tadashi G. Takaoka 6ba84dcd96 Merge "Refactor action label/icon definitions" into lmp-dev 2014-09-05 08:25:12 +00:00
Tadashi G. Takaoka 5166e9f0ff Refactor action label/icon definitions
Bug: 15782668
Change-Id: Ibf1205d46e9293d516a56030ba10841128f57450
2014-09-05 11:44:18 +09:00