Commit Graph

989 Commits (83b094a4c899818855c16122e6036e79be29d56f)

Author SHA1 Message Date
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 fba1bd0ec4 Suppress exceptions that have always been happening.
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
2013-10-04 19:10:26 +09:00
Alan Viverette afa565119c Merge "Update string comments for translation" 2013-10-03 20:34:24 +00:00
Satoshi Kataoka 194e004e81 Prepare for changing text color for functional keys
Bug: 10786040

Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
2013-10-03 15:54:46 +09:00
Alan Viverette 1240d28e57 Update string comments for translation
BUG: 11042719,11021829
Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
2013-10-02 17:07:20 -07:00
Alan Viverette 458fb52b98 Merge "Speak auto-corrections for accessibility" 2013-09-30 18:14:13 +00:00
Alan Viverette 67319f92f3 Speak auto-corrections for accessibility
BUG: 8669376
Change-Id: Id71b2c2835daa7a8c9d6c92c57a7e302551c289d
2013-09-27 14:15:53 -07:00
Satoshi Kataoka b44efbdcc0 Reduce Emoji size
Change-Id: Ie9dec82c0edde70a75fffeb7c86c14e05f468207
2013-09-28 02:02:47 +09:00
Satoshi Kataoka 9204d11525 Implement delete key repeater
Bug: 10810844
Change-Id: Idbfe2196e8f0f8cf6dd1b77574eefb395c12807a
2013-09-24 18:23:38 +09:00
Ken Wakasa 2c4bbe2596 Keypress vibration default value for Xperia Z Ultra
bug: 10832066
Change-Id: I9ed107f192d65e792529699b30bb88de73a5788a
2013-09-23 18:01:22 +09:00
Satoshi Kataoka d764a0a0ad Update resources: Colors
bug: 10786040

Change-Id: Idee67e73096e1e31126dbf24e9608d3e6dba2b47
2013-09-20 17:03:32 +09:00
Satoshi Kataoka baa3121704 Update resources
Change-Id: Ia66f7181514ee1471e181e16d15622174cf72e79
2013-09-20 14:49:54 +09:00
Satoshi Kataoka 250a12f6c2 Show Emoji category page id indicator
Bug: 10538430
Change-Id: I767fa8d41c789125af266f2203b4bad7452bc0a5
2013-09-19 18:41:13 +09:00
Satoshi Kataoka cf08ddbdb7 Fix test in SubtypeLocaleUtilsTests
Change-Id: I4f7bf70ec7a0a67ad5d2129afed314b1b1a93a6c
2013-09-19 11:45:11 +09:00
Jean Chalard 73d607fb70 Merge "[AC5] Introduce the setting for phrase gesture." 2013-09-17 03:42:38 +00:00
Satoshi Kataoka c65f6c3001 Merge "Split Emoji categories fitting the pager" 2013-09-16 09:31:47 +00:00
Satoshi Kataoka 5dfbc8af24 Split Emoji categories fitting the pager
Bug: 10538430
Change-Id: Ic023ac0b9db8a1fe16c73ab5fd12dfcd7cbbe6a3
2013-09-16 18:27:20 +09:00
Ken Wakasa 187dd85a40 Additional fix for Lao; No spaces used between words
bug: 6911140
Change-Id: I1b1141c203175b9f9a818564272c0aa49df33888
2013-09-16 12:03:30 +09:00
Jean Chalard a37bee2805 [AC5] Introduce the setting for phrase gesture.
Bug: 9059617
Change-Id: I6fa0f675f4edac10bd19228cd2f0c8fca97cebd6
2013-09-13 20:44:37 +09:00
Satoshi Kataoka 2d3d415826 Change space key height in Emoji keyboard view
bug: 10538430

Change-Id: I724a8c92b49a64196c7da2af40f3d20758e0dbae
2013-09-12 19:18:41 +09:00
Satoshi Kataoka 741831d322 Add margin to the label of language
Change-Id: I48dc63475caf5cc1a1ac09b82b26fbeaef993fa1
2013-09-06 17:21:44 +09:00
Satoshi Kataoka e3150664ae Revert "Remove symbols shifted layout related code"
This reverts commit 1cd027850b.

Bug: 9059539

Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
2013-09-04 16:27:34 +09:00
Satoshi Kataoka 5169937dd4 Revert "Revert "Support Emoji keyboard""
Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc972338.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d
2013-08-30 19:46:10 +09:00
Ken Wakasa aabc972338 Revert "Support Emoji keyboard"
This reverts commit d7791a93b0.

Change-Id: I5ca4c0227f97540e8a22b487b5056dfa3611082b
2013-08-30 07:23:42 +00:00
Tadashi G. Takaoka d7791a93b0 Support Emoji keyboard
Bug: 6370846
Change-Id: I33ce8f952799c89929996a226ac17731a953ec2a
2013-08-29 19:48:34 +09:00
Tadashi G. Takaoka 6c926a1d5e Add Nepali Traditional keyboard
Bug: 9833890
Change-Id: I0af4a358cc1457dc08c32744b5c170bd2a3382c9
2013-08-29 17:21:42 +09:00
Tadashi G. Takaoka 41745c4995 Add keyboardLayoutSet attribute to <case> condition
Change-Id: I017c4a3c1c7b2e4c6f607940078f61e120042270
2013-08-29 09:50:45 +09:00
Tadashi G. Takaoka 0861d67fd8 Fix unit test
The breakage of the unit tests has been introduced by Id8caf5a972 that
emptied the default styles. This change reverts back some attributes
to the default.

Change-Id: I2748eefe50e34bbf908071e4a1a17a70aa32bdef
2013-08-28 20:22:18 +09:00
Tadashi G. Takaoka 8e3a90e58f Merge "Add emoji keyboard related assets" 2013-08-28 07:55:22 +00:00
Tadashi G. Takaoka c0f81463cb Merge "Add dummy Emoji subtype" 2013-08-28 07:42:29 +00:00
Tadashi G. Takaoka 803ea61d55 Add recents keyboard
Bug: 6370846
Change-Id: I5dc235395fe9b3bd95711fee2fe9b678b4660760
2013-08-28 16:33:54 +09:00
Tadashi G. Takaoka 34cbcc1aed Add dummy Emoji subtype
Bug: 6370846
Change-Id: I4fa3a6832fa316d0c6312d434be3c3ff02b52402
2013-08-28 16:26:00 +09:00
Tadashi G. Takaoka d189d2a508 Add emoji keyboard related assets
Bug: 6370846
Change-Id: I86c446665387b5ddf7de08189de306f2bc569262
2013-08-28 16:21:44 +09:00
Tadashi G. Takaoka 26d3644434 Fix SuggetionStripView.ICS style
This is a follow up of I06427e8886.

Change-Id: Ib33d64f4a4c4f08a80983b6ddf8d117aacbedccb
2013-08-27 17:29:34 +09:00
Tadashi G. Takaoka e94bbca39b Aggregate theme resources into one file
Change-Id: I06427e88864bd9f644820dc8d755719cf2ac0ba6
2013-08-27 17:18:39 +09:00
Tadashi G. Takaoka 08323cd597 Add _gb to Gingerbread resources
Bug: 10415342
Change-Id: Id8caf5a972fe72b577dbf50dcd2cf739b2d35a32
2013-08-27 17:05:22 +09:00
Tadashi G. Takaoka adaaf9ffb8 Rename theme file names
Bug: 10415342
Change-Id: I692b157953f77c610482b494cbaeed4430bcb629
2013-08-27 14:41:54 +09:00
Tadashi G. Takaoka 1f4612fc54 Remove obsolete theme resources
Bug: 10415342
Change-Id: I9073c54b037e0f7973710a9e24ca5044f8db6db0
2013-08-27 12:47:26 +09:00
Tadashi G. Takaoka 2f5a933c04 Add GridRows tag to support emoji keyboard
Bug: 6370846
Change-Id: Ia68284b2402e52d835040da900a51cca669add2f
2013-08-26 17:19:24 +09:00
Tadashi G. Takaoka c120199f72 Import emoji unicode point list from Hangouts
Bug: 6370846
Change-Id: I14017f002a94647d2b3154f1f0805f194421b8b5
2013-08-26 16:05:14 +09:00
Tadashi G. Takaoka 68b990e7ce Add emoji keyboard element ids
Bug: 6370846
Change-Id: I0ac55bc06e1527bafad395f4a2b5059e1fed4b5d
2013-08-26 12:48:07 +09:00
Tadashi G. Takaoka 1cd027850b Remove symbols shifted layout related code
This is a follow up of I7fe6520e4e.

Bug: 9059539
Change-Id: Idb39906ddb1e2234a0d1c7c4d5e6fc728090e79e
2013-08-24 00:07:23 +09:00
Tadashi G. Takaoka 1f39d36458 Remove unnecessary alpha attributes of SuggestionStripView
Change-Id: I78701403d7bd21928c4b459bb336a565f386ebcc
2013-08-21 12:44:30 +09:00
Satoshi Kataoka d6ddb96ee8 Add a functionality to boost scores of personalization dictionary
Bug: 9429906
Change-Id: I1518c5cbc7d41188e7dc6a35d226da277ed5913f
2013-08-20 17:50:48 +09:00
Jean Chalard c239a34262 Support languages that don't use spaces.
Thai is an example.

Bug: 10138062
Change-Id: Ib9a8264c77ed42b4256432d7c8a60d08575dcdc7
2013-08-16 21:01:08 +09:00
Tadashi G. Takaoka e18439d5c7 Add empty key background type
Change-Id: I9b07c58a9b70ae0228f87e1f066ca8cd959b4f03
2013-08-14 18:12:11 +09:00
Jean Chalard 7f2cb76990 Increase CHAR_LIMIT to 29 to accommodate German.
Bug: 10221961
Change-Id: Ib9967f7a258f499d24294da16a9191cc2dda4a32
2013-08-08 15:00:33 +09:00
Jean Chalard 0f47d5163d Merge "Reword "No language"" 2013-08-06 11:11:21 +00:00
Tadashi G. Takaoka cc38bfb5d3 Merge "Add emoji icon and code as a groundwork" 2013-08-06 05:35:14 +00:00
Tadashi G. Takaoka b127d88285 Add emoji icon and code as a groundwork
The emoji switching key icon asset should be updated. The icons in
this change are just borrowed from Hangout.

Bug: 10179862
Bug: 6370846
Change-Id: Icea26d2cf2ac6a6df9beb4c98f646dbe309bdcd9
2013-08-06 14:16:15 +09:00
Tadashi G. Takaoka 52d220e71b Remove unnecessary suggestion strip container
Change-Id: I3710e1fe1574c0f69f7f448619e939fb45e9b8d3
2013-08-06 10:57:47 +09:00
Jean Chalard c5beb522ed Reword "No language"
Bug: 10064334
Change-Id: Ie4e6c333566eee9000fa5c8e59e9df8b9b56a5b3
2013-08-05 18:16:35 +09:00
Jean Chalard 965b7266c2 Fix a typo
Change-Id: Ie724a444ce056ee43b7ca2f10f30cce5843e61ad
2013-08-05 18:13:29 +09:00
Satoshi Kataoka d7491e6e81 Add a debug preference for using only personalization dictionary
Bug: 9429906
Change-Id: I2003060c7065e736d42f3b3303fbba549358dd18
2013-08-02 20:10:57 +09:00
Tadashi G. Takaoka 310ea9ab90 Remove sudden jump touch event hack
This hack was for Nexus One and Droid that can't run on ICS or later.

Change-Id: I1f9cef2022b0bbb333235e6b7c311c9785a1d894
2013-07-31 17:32:41 +09:00
Tadashi G. Takaoka 3029b25000 Add default keypress vibration duration of HTC J One
This change also removes obsolete HTC One Google Play edition's model
name.

Change-Id: Ic396d1a2288c8926782c3f0bc930170d468c047b
2013-07-23 19:38:29 +09:00
Jean Chalard d6c621cd87 Don't put spaces before and after asterisks
Change-Id: I3c87745c3d4e7a0c531f6c2e68120fada556b44b
2013-07-12 13:37:40 +09:00
Tadashi G. Takaoka 7937f09264 Lengthen CHAR LIMIT of settings_system_default
Bug: 9495443
Change-Id: Ib52d0ab357e79ae6004411f4b4201570a228bc71
2013-06-20 12:08:37 +09:00
Tadashi G. Takaoka c90181d6aa Use system default key press volume
Bug: 9475973
Change-Id: I6ae825b161dde69e19b52d73fb9aa782e2aa7423
2013-06-18 21:34:30 +09:00
Tadashi G. Takaoka af69a14c96 Use system default vibration pattern
Bug: 9468462
Change-Id: Ifa46a56873c10888da8eaa2782fe07ef138a141b
2013-06-18 21:33:51 +09:00
Tadashi G. Takaoka 3be8263035 Get value text from ValueProxy
As a preparation to show "system default" in the settings. LatinIME
can't know the actual system default value.

Bug: 9468462
Change-Id: I0b7898d1ca29ded7a619dd636d2ad16eb0db292e
2013-06-18 18:27:17 +09:00
Tadashi G. Takaoka eab37ec2e5 Add HTC One special edition
Bug: 9109493
Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
2013-06-06 17:33:23 +09:00
Tadashi G. Takaoka a0c3e02d71 Refactor SuggestionStripLayoutHelper a bit
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka 70c2dcffa3 am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
  Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:49:07 -07:00
Tadashi G. Takaoka 6f7e39a682 am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
  Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka 4c75ea858a Check all regexp patterns in ResourceUtils.getDeviceOverrideValue
This change also fixes a regexp error of Galaxy S III.

Change-Id: I42a4780bbfd2b083f4e27e61ec513aa875907344
2013-05-28 19:05:40 +09:00
Tadashi G. Takaoka 02088f4497 Add vibration override values for Galaxy S4 and HTC One
Bug: 9109493
2013-05-23 17:03:42 -07:00
Tadashi G. Takaoka 46bf9f493c am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
  Revise welcome screen video and still image
2013-05-15 12:59:17 -07:00
Ken Wakasa acb37023b2 am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
  Adjust sampling interval for gesture stroke drawing a bit.
2013-05-15 12:59:11 -07:00
Tadashi G. Takaoka 2d86b73ffe am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
  Tune maximum keypress duration to 100 milliseconds
2013-05-15 12:53:14 -07:00
Tadashi G. Takaoka 7e52c35dce am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
  Fix keypress vibration duration of HTC One X
2013-05-15 12:53:13 -07:00
Tadashi G. Takaoka c731457f8a am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
  Add device specific keypress vibration duration database
2013-05-15 12:53:10 -07:00
Tadashi G. Takaoka aaf7d70be7 am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
  Support multiple condition for getDeviceOverrideValue
2013-05-15 12:53:03 -07:00
Ken Wakasa 8738eeaf65 am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
  Rename GesturePreviewTrail.java -> GestureTrail.java
2013-05-15 12:53:02 -07:00
Tadashi G. Takaoka 941e8bbaa9 am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
* commit 'a01ab9ea3580d95e87f3357b2612fb84971b3bfd':
  Refactor StringUtils.findPrefixedString to findValueOfKey
2013-05-15 12:52:55 -07:00
Tadashi G. Takaoka bd2aca0b77 am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
* commit 'c614357468c496db420c7b1d0a8a119f86620f8a':
  Move gesture preview trail parameters to resource
2013-05-15 12:46:56 -07:00
Tadashi G. Takaoka 55b98d2549 am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
* commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2':
  Remove unused device form factor values
2013-05-15 12:46:39 -07:00
Baligh Uddin c363302eb7 Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp
Conflicts:
	java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

Conflict resolved by matching code with jb-mr2-dev.
2013-05-15 11:40:41 -07:00
Satoshi Kataoka fa47814ca3 am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
  Fix the title of the fragment of the personal dictionary
2013-05-15 11:19:28 -07:00
Jean Chalard 926abffaaa am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
* commit '42abed7ff30b4ad4c04407a81db8de86244b1d80':
  [ZF3] Add the option to block potentially offensive words
2013-05-15 11:05:06 -07:00
Jean Chalard 3160671bc1 am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."
* commit '330072b0146ffe148417d43ee0842c1238b6923d':
  [ZF2] Read settings for profanity filtering.
2013-05-15 11:05:03 -07:00
Tadashi G. Takaoka e681b52822 am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project"
* commit '7a2fbbb3e6c807340be95807fbd70042466a5426':
  Add strings-appname.xml to AOSP Android Keyboard project
2013-05-15 11:04:58 -07:00
Tadashi G. Takaoka 037be7fa0a am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
  Remove graying animation of alt-code keys while typing
2013-05-15 11:04:55 -07:00
Satoshi Kataoka 56ec8d6a02 am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry to the user dictionary"
* commit '36de7a5ea32ef6738a2923581e0b14a00b8a6808':
  Implement a functionality to add an entry to the user dictionary
2013-05-15 11:04:41 -07:00
Tadashi G. Takaoka b713600a52 am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard"
* commit 'fd4baafe710dc0fe843c7672a6bd8bee4244fd73':
  Add next axction to setup wizard
2013-05-15 10:58:58 -07:00
Tadashi G. Takaoka dfa5d2d799 am 38df0ed2: am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet"
* commit '38df0ed22b232d77119c709ee0e7a863c7f756b6':
  Tune setup wizard layout for landscape and tablet
2013-05-15 10:58:57 -07:00
Satoshi Kataoka 96d5e29166 am 6448f749: am b35aa487: Merge "Make aggressive threshold really aggressive"
* commit '6448f749154a723b85d4309a37ad8fda2e1434e3':
  Make aggressive threshold really aggressive
2013-05-15 10:58:55 -07:00
Tadashi G. Takaoka b689e6615b am 9ff6a6bf: am 3ee39be1: Merge "Add setup wizard indicator size resource"
* commit '9ff6a6bf739e250f2ad7e868c2be55567c23fb7b':
  Add setup wizard indicator size resource
2013-05-15 10:58:50 -07:00
Tadashi G. Takaoka 230068e2cd am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard"
* commit '5cd83c9341c04c63de136b0e1e8b581e88704075':
  Use resources for dimensions of setup wizard
2013-05-15 10:58:45 -07:00
Tadashi G. Takaoka d66e4c4515 am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application"
* commit '0bc46dca2cea2b15e1647533f81ea0ea992a41b4':
  Remove wording "wizard" from setup application
2013-05-15 10:58:41 -07:00
Tadashi G. Takaoka 85e8dca43e am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"
* commit 'dc079451fc5bb10548d0d78c8db5e060e9a2f000':
  Add edit personal dictionary settings menu
2013-05-15 10:58:40 -07:00
Satoshi Kataoka 874c4fda36 am 434abe45: am 9b4e3db1: Legal notice
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
  Legal notice
2013-05-15 10:53:02 -07:00
Tadashi G. Takaoka 962c245c00 am 6bbe6858: am 0f07935e: Centering setup wizard welcome video
* commit '6bbe68589318a808c0eade6a62ffb0986a894ae0':
  Centering setup wizard welcome video
2013-05-15 10:52:54 -07:00
Tadashi G. Takaoka 56c6c336b2 am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings
* commit 'ab11dbe8f3fbc7b55b251d69e3846cab24811903':
  Remove translatable="false" from setup wizard strings
2013-05-15 10:52:46 -07:00
Tadashi G. Takaoka 67f3a10225 am c35e0e6a: am 42afa82d: Support landscape orientation for setup wizard
* commit 'c35e0e6a4b73f854fef07165c4f0bdd448f5bed5':
  Support landscape orientation for setup wizard
2013-05-15 10:52:44 -07:00
Tadashi G. Takaoka b2f8f66f28 am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen
* commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41':
  Groundwork to implement landscape and welcome screen
2013-05-15 10:52:41 -07:00
Tadashi G. Takaoka 680fa7ba77 am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"
* commit '82a7b185bb8a14e610950548d36fae7a06030236':
  Add finish action to setup wizard
2013-05-15 10:52:40 -07:00
Tadashi G. Takaoka 448b28beff am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files
* commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283':
  Move some attributes of setup wizard layouts to style files
2013-05-15 10:52:33 -07:00
Tadashi G. Takaoka 8b085e7f87 am 7158438a: am 88ee052c: Merge "Update strings of setup wizard"
* commit '7158438a64d3f224590c484c989251d82b7fb5fa':
  Update strings of setup wizard
2013-05-15 10:52:30 -07:00