Commit graph

972 commits

Author SHA1 Message Date
Tadashi G. Takaoka
74d0bb09c7 Eliminate redundant time parameter from gesture detection code
This change also uses the key width to determine the sampling rate of
the gesture points (instead of the key height).

Change-Id: I987487825693b4883d8359eb5b31f1d668cd5ef4
2012-08-13 18:11:03 +09:00
Ken Wakasa
0fb950858e Cleanups in geometry_utils.h
Change-Id: Ic051703e5b67adfc62753ebd9ab254296719c6e9
2012-08-13 17:47:00 +09:00
Tadashi G. Takaoka
fc5e3f973c Remove unnecessary drawing point
Change-Id: Ib9cba3484a72306320eb9c1744d940da1a0998c7
2012-08-13 14:03:10 +09:00
Tadashi G. Takaoka
708cc94a35 Remove gesture detection hacking code
Change-Id: Idaec3753592ca0a5c5545eb5ab65254a3e32e662
2012-08-13 12:19:19 +09:00
Ken Wakasa
bcec82de66 Clean up constructors
And, use C++ style casts and use float math functions rather than double ones to save memory space.

Also, stop using FloatMath and NativeUtils as standard Math methods are faster now.
See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700

multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a

Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
2012-08-13 10:48:37 +09:00
Tadashi G. Takaoka
1b6829b0e0 Remove conservative MainKeyboardView.draw
Change-Id: I52f58d1e013dfe1f1b0f8320cba903d3dbb4eabd
2012-08-10 11:02:41 +09:00
Tadashi G. Takaoka
877157e1f5 Optimize keyboard drawing code a bit
* Remove useless boolean flag.
 * Use invalidate(int,int,int,int).
 * Don't draw background when hardware acceleration is enabled.

Change-Id: Id560ac84f33b5151437a42a4ff22736284d71e2d
2012-08-09 16:44:11 +09:00
Tadashi G. Takaoka
8335c59ea7 Fix NPE and don't call UI API from non-UI thread
This change also reverts I29ec3e9f10484f30288fac76f0c45b3707bc2259

Bug: 6956969
Bug: 6891020
Bug: 6947253
Change-Id: I7901c0f9489b4deb79314c2c903b138611bfd78e
2012-08-09 11:55:41 +09:00
Tadashi G. Takaoka
732f27984e Merge "Add toString() method to Keyboard" into jb-mr1-dev 2012-08-08 00:08:13 -07:00
Tadashi G. Takaoka
35336cf83a Add toString() method to Keyboard
Change-Id: I74c8f006323ed78ec67414fd17849ab40966968e
2012-08-08 15:59:56 +09:00
Tadashi G. Takaoka
7ae1fd02d4 Use ArrayList to implement PointerTrackerQueue
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
Tadashi G. Takaoka
0cc425bd9c Add PointerTrackerQueue unit tests
This is a groundwork to elminate LinkedList from PointerTrackerQueue.

Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
Tadashi G. Takaoka
27e48447a4 Lingering gesture floating preview text a bit
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
Tadashi G. Takaoka
4e9e6cd154 Fix IllegalStateException of KeyDetector
A KeyDetector without Keyboard may exist in some rare cases. This
change eliminates throwing IllegalStateException and checks explicitly
against null.

Bug: 6891020
Change-Id: I29ec3e9f10484f30288fac76f0c45b3707bc2259
2012-08-06 11:09:50 +09:00
Tadashi G. Takaoka
622d6a5b1b Using hardware accelerated drawing
When Canvas has been hardware accelerated, don't use offscreen bitmap.

Bug: 6872994
Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
2012-08-03 20:46:10 +09:00
Tadashi G. Takaoka
ffe36cdc6d Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev 2012-08-02 01:04:05 -07:00
Tadashi G. Takaoka
8344259fc9 Small cleanup for keyboard drawing code
Change-Id: I8b562e03b30f82dddae311b49d316402e867cd31
2012-08-02 16:50:31 +09:00
Tadashi G. Takaoka
44972bcdb6 Fix multi-touch input in auto-caps field
Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
2012-08-01 18:56:11 +09:00
Tadashi G. Takaoka
d2173b5737 Cancel the while-typing timer when user hits the spacebar
Bug: 6689079
Change-Id: I6b366acdcefb8b2c0d973a4f2a12329fc12eb5c5
2012-07-31 19:39:52 +09:00
Tadashi G. Takaoka
b98b957424 Fix east slavic keyboard layouts
This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.

[Ukrainian]
 * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
   on 10-inch tablet.
 * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
   GHE.

[Belarusian]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
   on 10-inch tablet.

[Kyrgyz]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

[Russian]
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".

Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
2012-07-31 13:19:11 +09:00
Tadashi G. Takaoka
ca57f5ba40 Move gesture preview parameters to KeyboardView attributes
Change-Id: Iff9d6b485e202656fc869f3ff4d94575ad2c186f
2012-07-30 20:10:48 +09:00
Tadashi G. Takaoka
6b9677d84b Merge "Small fix to KeyboardView" into jb-mr1-dev 2012-07-30 01:48:59 -07:00
Tadashi G. Takaoka
b9770cb7f7 Merge "Add device form factor to KeyboardId" into jb-mr1-dev 2012-07-30 00:50:25 -07:00
Tadashi G. Takaoka
edf7990e84 Small fix to KeyboardView
Change-Id: Ifb7500ec2e55b50bb7951aa847fd4fbf49e32f4e
2012-07-30 16:50:03 +09:00
Tadashi G. Takaoka
293f062c26 Merge "Add advanced options to turn on/off the gesture trail and text preview" into jb-mr1-dev 2012-07-30 00:22:41 -07:00
Tadashi G. Takaoka
47e2bf3298 Add advanced options to turn on/off the gesture trail and text preview
Bug: 6883053
Change-Id: I601718afb37289108b45ef68626c7c315edca35d
2012-07-30 15:54:27 +09:00
Tadashi G. Takaoka
75fb3ce1be More readable Key.toString() and MoreKeySpec.toString()
Change-Id: Iee3c33dedd0c00ba259aa55e8b0c1c57b84eccdd
2012-07-30 15:51:41 +09:00
Tadashi G. Takaoka
4731b67629 Add device form factor to KeyboardId
This is a groundword for optimizing keyboard parsing.

Bug: 6860259
Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
2012-07-30 15:33:17 +09:00
Tadashi G. Takaoka
efd8b838ee Add MoreKeySpec.toString() method for debugging
Change-Id: Icf9c6e15521849ffc51911c1e256c9815c1960f4
2012-07-30 15:06:26 +09:00
Tadashi G. Takaoka
1057670881 Make PreviewPlacerView final
This is a groundwork for the bug.

Bug: 6883053
Change-Id: I51e9235d3bc7021790a88a44596c4314125a1ab3
2012-07-27 19:40:39 +09:00
Tadashi G. Takaoka
99906b3fc2 Move SuddenJumpingTouchEventHandler to internal package
Change-Id: Ifc9fb6322a2edbaac0b10e7134ee7e735f14937b
2012-07-27 14:25:53 +09:00
Tadashi G. Takaoka
97c8d288a8 Add Zulu keyboard
Bug: 6867914
Change-Id: I13316ac2a554a8601f920e875d540e5375e12860
2012-07-26 19:03:35 +09:00
Tadashi G. Takaoka
e863fb712f Merge "Fix gesture detection when sliding key input is disabled" 2012-07-26 02:13:20 -07:00
Tadashi G. Takaoka
c902dfeb8f Fix gesture detection when sliding key input is disabled
Bug: 6867837
Change-Id: Icbfa69928c436343db545860a7d63171f52266b6
2012-07-26 17:41:54 +09:00
Tadashi G. Takaoka
b90363e40c Fix Afrikaans more keys layout
Bug: 6867914
Change-Id: I43178a729f4770743f9fea87bad539c54da045c5
2012-07-26 16:31:06 +09:00
Tadashi G. Takaoka
55c01170c4 Add Afrikaans keyboard layout
Bug: 6867914
Change-Id: Ice35b20a0a51dda21c8271256064523bb5844952
2012-07-26 15:57:35 +09:00
Tadashi G. Takaoka
941f222c21 Merge "Remove unused setProximityCorrectionEnabled() methods" 2012-07-25 19:54:40 -07:00
Shawn Pearce
0a370ac80f Merge "Add Swahili keyboard layout" 2012-07-25 10:58:44 -07:00
Tadashi G. Takaoka
c4376db0f0 Remove unused setProximityCorrectionEnabled() methods
Change-Id: I03aa6608ee435b36377de41684162b303740f571
2012-07-25 20:37:36 +09:00
Tom Ouyang
2f81757c3a Add dynamic floating preview for incremental gesture recognition.
Change-Id: I7ba7ac24aa96a0ff19267997c5b58853079bc6dc
2012-07-25 19:40:55 +09:00
Tadashi G. Takaoka
a28f6c9a18 Add Swahili keyboard layout
Bug: 6867914
Change-Id: I2b9b0a06ff49a2afe16ec7a0ace0503d1658d413
2012-07-25 17:48:37 +09:00
Tom Ouyang
e68385871a Fix gesture trail rendering on tablet.
Bug: 6867837
Change-Id: I54dceee1c83679f78462104d6cee1f2300a0cfc2
2012-07-25 16:12:37 +09:00
Tadashi G. Takaoka
0657b9698a Update gesture mode state when dictionary gets available
Bug: 6860204
Change-Id: I840b7bf1983ab92fa4e0b180129176539e96409f
2012-07-25 16:11:53 +09:00
Tadashi G. Takaoka
9ecf634686 Add Seriban Latin keyboard layout as comments
Bug: 6867914
Bug: 6867842
Change-Id: I3434434628e72fdb127d158de6c17fdfa77ee9c8
2012-07-24 20:07:59 +09:00
Tadashi G. Takaoka
a01d9aea64 Add Tagalog keyboard layout
Bug: 6867914
Change-Id: I78ca6216cc74f8d34291950c05c810c800a3ddba
2012-07-24 18:54:43 +09:00
Tadashi G. Takaoka
c8e45ddb03 Rename LatinKeyboardView to MainKeyboardView
Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
2012-07-23 12:11:43 +09:00
Kurt Partridge
a4f762ff98 Merge "ResearchLogging indicator" 2012-07-22 19:31:40 -07:00
Kurt Partridge
4fa6e57260 ResearchLogging indicator
- shows a indicator that logging is on.  two options are available: an obvious
red outline around the keyboard, and a subtle red dot in the lower right-hand
corner.  currently configured for the subtle red dot.

Bug: 6188932
Change-Id: I0fd1ac5a0f20329adc603aa65ab85f2d38b9fc43
2012-07-22 19:04:34 -07:00
Kurt Partridge
74c95d6d18 Merge "ResearchLog splash screen" 2012-07-22 18:53:38 -07:00
Kurt Partridge
4331012a9e ResearchLog splash screen
Bug: 6188932
Change-Id: I1b247ecc26a2dd4f3f1c1b1cd3d928af717ebdd5
2012-07-22 18:36:43 -07:00
Tom Ouyang
ccaa799ee9 Update gesture bounding box handling.
Change-Id: I085611ce6fd82608f284d74973e5bb14258cdc24
2012-07-22 10:54:27 +09:00
Kurt Partridge
6b966160ac ResearchLog refactor
- new package: com.android.inputmethod.research

multi-project commit with Ic0a5744f3160d13218addd589890623c0d120ffc

Bug: 6188932

Change-Id: Icf8d4a40a5725401799be6e209a640d99a5f34c4
2012-07-20 15:06:51 -07:00
Tadashi G. Takaoka
7519091f7c Use ResizableIntArray in GestureStroke
Change-Id: I034e80df03c7c6c0895fdf2c03763627d410d425
2012-07-20 19:32:28 +09:00
Tadashi G. Takaoka
2474b37abd Merge "Disable gesture input detection when more keys keyboard is showing" 2012-07-20 03:28:52 -07:00
Tadashi G. Takaoka
62b8dddb6d Add gesture input enable settings
Bug: 6845325
Change-Id: I3165465b0b280e32a9288da16abb75baa67288dc
2012-07-20 19:26:36 +09:00
Tadashi G. Takaoka
cc3500b0c8 Disable gesture input detection when more keys keyboard is showing
Bug: 6852441
2012-07-20 18:40:31 +09:00
Tom Ouyang
b8bd45a22a Merge "Fix bug where key previews do not show up." 2012-07-20 02:06:29 -07:00
Tom Ouyang
c022a9f8d4 Fix bug where key previews do not show up.
Bug: 6852705

Change-Id: Ib90107a5dde774b4d6c1e570629ce7f7eaff44bc
2012-07-20 18:02:12 +09:00
Ken Wakasa
afed0567e9 Performance improvements - Avoid using iterators
Change-Id: Iab604aa1ef67acf5d54208a6bc44635632845ae0
2012-07-20 17:51:52 +09:00
Tom Ouyang
4daf32b6c0 Add gesture trail feedback.
Change-Id: I32709fac0dec3165678a052aa286e2fb3d90721b
2012-07-20 17:09:23 +09:00
Ken Wakasa
2fc127698a Make ALPHA_OPAQUE public
Change-Id: I904685be07e23292dd95296617a4b64c366f06f2
2012-07-20 12:17:31 +09:00
Tom Ouyang
0c5f72e2bf Improve incremental gesture tracking.
Eliminates need to recreate batch InputPointers on each gesture move event.
Fixes issue where batch points from previous tapping input get mixed into next gesture.

Change-Id: I9ecac66db88f5a87c6dde2138408906dd3d11139
2012-07-20 10:44:37 +09:00
Tadashi G. Takaoka
1e6f39a9f9 Tune the gesture detection logic a bit
Change-Id: Ia8e8c15fdbbd49768d57cafd50325e7e45af6251
2012-07-19 18:53:39 +09:00
Tadashi G. Takaoka
918e420d1b Gesture input should be turned off depending on the configuration
The gesture input will be disabled when
 * It is AOSP build.
 * Accessibility mode is on.
 * The input field is password mode.

Bug: 6844755
Bug: 6844763
Bug: 6845011
Change-Id: I74972cc765d15c08059e0c9014f863ffb2a57c6c
2012-07-19 16:33:09 +09:00
Tadashi G. Takaoka
57f7de0ba6 Add default capacity parameter to InputPointers' constructor
Change-Id: I02f23096f0682d30effe4dfc1ca57881a1e4aedc
2012-07-19 12:06:00 +09:00
Tadashi G. Takaoka
9580c467f9 Consolidate GestureTracker into PointerTracker
Change-Id: Ib28fae10493a9142ba4dff6cf57f52c59766b209
2012-07-18 20:11:06 +09:00
Tadashi G. Takaoka
10102f02af Change the batch input methods of KeyboardActionListener
This change also removes the reference of SuggestedWords from
GestureTracker and KeyboardActionListener.

Change-Id: I25ef8756007986abf99a931afd665bbfe6fa387f
2012-07-18 18:53:36 +09:00
Tadashi G. Takaoka
f39fccbd0f Make GestureStroke as top level class
And make PointerTracker object has GestureStroke object.

Change-Id: Ibf5cfd593c4f13468368e01acb847589b0ab12e7
2012-07-18 17:32:17 +09:00
Tadashi G. Takaoka
3ec31f4971 A gesture should not start from the delete key
Change-Id: I5c8c7665454b7f10f944f307431dfffe20cf3134
2012-07-18 14:38:51 +09:00
Tadashi G. Takaoka
af2c115253 Opening punctuations have a priority in Spanish keyboard
Bug: 6737535
Change-Id: I87442eb978ac68be3d3df99eed8a92877a6f4ab0
2012-07-17 16:14:36 +09:00
Tom Ouyang
eea34598bf Merging minimal gesture input
Change-Id: Iee6ae48bb6309c2867b5d2e344fe7d86dfabd654
2012-07-13 19:32:18 +09:00
Tadashi G. Takaoka
5e06b8534f Register the key when the finger slides off it in multitouch
Moved from jb-dev branch (I807fd6f4).

Bug: 6722867
Change-Id: I9764ac72f726396caaac819675d440372c882981
2012-07-10 20:14:29 +09:00
Tadashi G. Takaoka
4be03befe3 Extend onTextInput to be able to inject suggestions
Change-Id: I1061da0edfdb05c64c5711717d4ef9fa9681e568
2012-07-06 19:36:11 +09:00
Tadashi G. Takaoka
15d3532170 Merge "Fix tab key's navigation behavior" 2012-07-05 01:24:00 -07:00
Tadashi G. Takaoka
b28934adac Fix tab key's navigation behavior
Bug: 6435484
Change-Id: Iffe459c117ad438e96ec6f5c7e64fb80b32d227e
2012-07-05 16:57:14 +09:00
Tadashi G. Takaoka
5946838b8e Fix upper case Eszett more key
Bug: 6773873
Change-Id: I1a533c729c312a53663fb142cb6fcb4915b53206
2012-07-05 16:13:52 +09:00
Tadashi G. Takaoka
8f6c603b3b Fix Keyboard.getKey as thread safe
This is a follow up of Id962e670.

Change-Id: I9e8542bff9e8faf57f934051fe612463c99ad61f
2012-07-05 11:43:43 +09:00
Tadashi G. Takaoka
5c641a9f59 Remove WordComposer.add(int, int, int, KeyDetector) method
Change-Id: Ie6af46acba18a2d1cf3ddd1578d60ded4c90f89a
2012-07-04 17:29:47 +09:00
Tadashi G. Takaoka
56853c1e48 Use SparseArray<E> instead of HashMap<Integer,E>
Change-Id: Id962e670ee1a5164e6c69deb84625139bf5e7974
2012-06-29 17:56:31 +09:00
Tadashi G. Takaoka
abf81192ff Merge "Remove unnecessary variables" 2012-06-26 03:16:17 -07:00
Tadashi G. Takaoka
3314d38daf Pass MotionEvent to PointerTracker
This is a one of groundwork to integrate gesture input.

Change-Id: I5b75c6978b51df91fdc384a9f6d1d5a5ddc563e2
2012-06-26 19:05:47 +09:00
Tadashi G. Takaoka
0d9d37cec2 Remove unnecessary variables
Bug: 6722052
Change-Id: I92e85b3e49b8f4b228f0cf0994216c5050e0865c
2012-06-26 19:01:59 +09:00
Tadashi G. Takaoka
d7edd1cbb5 Cleanup PointerTracker debug method
Change-Id: Ib3bfa0a46f5814a6df838005d7243e2f536a98a0
2012-06-26 18:36:30 +09:00
Tadashi G. Takaoka
8a092b4ede Update current key reference in PointerTracker when keyboard is changed
This change also checks that the current key is the same key that
started the key repeat, when key repeat timer is fired.

Bug: 6722052
Change-Id: Id69880ded3338a5a3cbe7f8bf951f94f2651119c
2012-06-26 15:00:12 +09:00
Tadashi G. Takaoka
a5bbb8df75 am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboard
* commit 'e4bbff783bddb70f52402454987ede281fb86039':
  Fix duplicate period on Persian tablet keyboard
2012-06-18 10:52:54 -07:00
Tadashi G. Takaoka
794a9c913a am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code points
* commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8':
  Fix Persian keyboard having correct code points
2012-06-18 10:52:46 -07:00
Tadashi G. Takaoka
38dc9ca314 Fix duplicate period on Persian tablet keyboard
Bug: 6679579
Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
2012-06-18 10:33:03 -07:00
Tadashi G. Takaoka
6de1b7a709 Fix Persian keyboard having correct code points
Bug: 6679850
Change-Id: Iaa33f48ffb5634de31e039574fb58185c6c078e8
2012-06-16 20:30:45 -07:00
Tadashi G. Takaoka
9328e0f2d9 am aee2ed1f: am 14bc2e89: Fix Arabic diacritics order
* commit 'aee2ed1f4b0be7a538cc5722fed274632f2a40ba':
  Fix Arabic diacritics order
2012-06-14 21:08:18 -07:00
Tadashi G. Takaoka
14bc2e89ef Fix Arabic diacritics order
Bug: 6662536
Change-Id: I96e45ce0e8b9b5440a54f3b321a925bc87ec3ca9
2012-06-14 20:33:52 -07:00
Tadashi G. Takaoka
dfcf7cac5e am 1ab436c1: am 0e473e9c: Reorder Persian diacritics
* commit '1ab436c1e60c0e49333549fb93e135fa99458bda':
  Reorder Persian diacritics
2012-06-14 18:30:52 -07:00
Tadashi G. Takaoka
0e473e9c92 Reorder Persian diacritics
Bug: 6661783
Change-Id: I42bab7655121ec5671854d54c47bd0c7a29e7a98
2012-06-14 16:56:36 -07:00
Tadashi G. Takaoka
775d8dcaeb am de1d88eb: am 32f4ceb2: Dismiss more suggestions panel when suggestions strip is closed
* commit 'de1d88eb4199160899d227f2c679215e16410c42':
  Dismiss more suggestions panel when suggestions strip is closed
2012-06-14 14:49:08 -07:00
Tadashi G. Takaoka
32f4ceb243 Dismiss more suggestions panel when suggestions strip is closed
This change fixes possible NPE as well.

Bug: 6658028
Change-Id: I8706808d1002b7b0b95930fd9b08568f08645da6
2012-06-14 11:57:43 -07:00
Tadashi G. Takaoka
c380959f48 am bbf18807: am 1db4f951: Fix the order of Persian diacritics
* commit 'bbf188075d5e14626c0609f4c3ee6031f6c6d5a6':
  Fix the order of Persian diacritics
2012-06-14 10:33:46 -07:00
Tadashi G. Takaoka
1db4f95105 Fix the order of Persian diacritics
The java source file KeyboardTextsSet.java has rather big change, but
this file is auto generated by "maketext" tool. The crucial part of
this change is in 5 XML resource files.

Bug: 6661783
Change-Id: I1d827ab0ebe6caa5ab73531682d6c32540b0d7aa
2012-06-14 15:18:25 +09:00
Tadashi G. Takaoka
9f42140ae2 Remove useless copy constructor of ProximityInfo
Change-Id: I56b4a99f670ad38708ad83d76b93a631295e3333
2012-06-12 15:13:07 -07:00
Jean Chalard
e91f32d8c1 Merge "Remove a slew of Eclipse warnings." 2012-06-08 00:35:05 -07:00
Jean Chalard
7214617622 Remove a slew of Eclipse warnings.
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Satoshi Kataoka
eed2cf287d Merge "Separate state from proximity_info step1" 2012-06-07 22:18:11 -07:00