nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 212368e8: Merge "Support "nm" (no mic) privateImeOptions" into honeycomb 

* commit '212368e8771048ba6b60c6426eddc4192fd8b2e1':
  Support "nm" (no mic) privateImeOptions
main
Tadashi G. Takaoka 2011-01-13 23:11:40 -08:00 committed by Android Git Automerger
parent bb4fc71bb9 212368e877
commit c249c6774d
7 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/res/xml-xlarge/kbd_number.xml
View File

@ -132,9 +132,15 @@
latin:keyLabel="0" /> latin:keyLabel="0" />
<Key <Key
latin:keyLabel="#" /> latin:keyLabel="#" />
<Key <switch>
latin:keyStyle="micKeyStyle" <case
latin:keyWidth="8.042%p" /> latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
</case>
</switch>
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

12
java/res/xml-xlarge/kbd_phone.xml
View File

@ -140,9 +140,15 @@
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key <switch>
latin:keyStyle="micKeyStyle" <case
latin:keyWidth="8.042%p" /> latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
</case>
</switch>
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

12
java/res/xml-xlarge/kbd_phone_symbols.xml
View File

@ -152,9 +152,15 @@
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key <switch>
latin:keyStyle="micKeyStyle" <case
latin:keyWidth="8.042%p" /> latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="8.042%p" />
</case>
</switch>
<!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
the touch event on the area, "#" is intentionally not marked as a right edge key. --> the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row> </Row>

10
java/res/xml-xlarge/kbd_qwerty_row4.xml
View File

@ -114,7 +114,13 @@
latin:popupCharacters="_" /> latin:popupCharacters="_" />
</default> </default>
</switch> </switch>
<Key <switch>
latin:keyStyle="micKeyStyle" /> <case
latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
</switch>
</Row> </Row>
</merge> </merge>

10
java/res/xml-xlarge/kbd_symbols.xml
View File

@ -162,7 +162,13 @@
latin:popupCharacters="“,”,«,»,˝" /> latin:popupCharacters="“,”,«,»,˝" />
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />
<Key <switch>
latin:keyStyle="micKeyStyle" /> <case
latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
</switch>
</Row> </Row>
</Keyboard> </Keyboard>

10
java/res/xml-xlarge/kbd_symbols_shift.xml
View File

@ -139,7 +139,13 @@
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="37.454%p" /> latin:keyWidth="37.454%p" />
<Key <switch>
latin:keyStyle="micKeyStyle" /> <case
latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="micKeyStyle" />
</case>
</switch>
</Row> </Row>
</Keyboard> </Keyboard>

5
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -25,9 +25,6 @@ import com.android.inputmethod.keyboard.LatinKeyboardView;
import com.android.inputmethod.latin.Utils.RingCharBuffer; import com.android.inputmethod.latin.Utils.RingCharBuffer;
import com.android.inputmethod.voice.VoiceIMEConnector; import com.android.inputmethod.voice.VoiceIMEConnector;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -37,7 +34,6 @@ import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.XmlResourceParser;
import android.inputmethodservice.InputMethodService; import android.inputmethodservice.InputMethodService;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Debug; import android.os.Debug;
@ -74,7 +70,6 @@ import android.widget.HorizontalScrollView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;