diff options
Diffstat (limited to 'java/res')
28 files changed, 776 insertions, 161 deletions
diff --git a/java/res/layout-sw768dp/recognition_status.xml b/java/res/layout-sw768dp/recognition_status.xml index 40bc09823..d476651c6 100644 --- a/java/res/layout-sw768dp/recognition_status.xml +++ b/java/res/layout-sw768dp/recognition_status.xml @@ -26,8 +26,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/popup_layout" android:orientation="vertical" - android:layout_height="371dip" - android:layout_width="500dip" + android:layout_height="371dp" + android:layout_width="500dp" android:layout_centerInParent="true" android:background="@drawable/vs_dialog_red"> <TextView @@ -36,13 +36,13 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:singleLine="true" - android:layout_marginTop="10dip" + android:layout_marginTop="10dp" android:textSize="28sp" android:textColor="#ffffff" android:layout_gravity="center" android:visibility="invisible"/> <RelativeLayout - android:layout_height="0dip" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1.0"> <com.android.inputmethod.deprecated.voice.SoundIndicator @@ -65,8 +65,8 @@ android:id="@+id/progress" android:indeterminate="true" android:indeterminateOnly="false" - android:layout_height="60dip" - android:layout_width="60dip" + android:layout_height="60dp" + android:layout_width="60dp" android:layout_centerInParent="true" android:visibility="gone"/> </RelativeLayout> @@ -82,14 +82,14 @@ android:layout_width="wrap_content" android:singleLine="true" android:textSize="14sp" - android:layout_marginBottom="3dip" + android:layout_marginBottom="3dp" android:layout_gravity="center" android:textColor="#ffffff" android:visibility="invisible"/> <Button android:id="@+id/button" android:layout_width="match_parent" - android:layout_height="54dip" + android:layout_height="54dp" android:singleLine="true" android:focusable="true" android:text="@string/cancel" diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 0a8d71f30..3863534be 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -28,7 +28,7 @@ <View android:id="@+id/key_preview_backing" android:layout_width="match_parent" - android:layout_height="0dip" /> + android:layout_height="0dp" /> <!-- On tablets, the suggestions strip is centered with horizontal paddings on both sides because width of the landscape mode is too long for the suggestions strip. This diff --git a/java/res/layout/key_preview.xml b/java/res/layout/key_preview.xml index b620d07d8..6ed892e28 100644 --- a/java/res/layout/key_preview.xml +++ b/java/res/layout/key_preview.xml @@ -20,8 +20,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="80sp" - android:textSize="40sp" - android:minWidth="32dip" + android:layout_height="80dp" + android:textSize="40dp" + android:minWidth="32dp" android:gravity="center" /> diff --git a/java/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml index a2ddb7c50..578788831 100644 --- a/java/res/layout/recognition_status.xml +++ b/java/res/layout/recognition_status.xml @@ -26,8 +26,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/popup_layout" android:orientation="vertical" - android:layout_height="371dip" - android:layout_width="500dip" + android:layout_height="371dp" + android:layout_width="500dp" android:layout_centerInParent="true" android:background="@drawable/vs_dialog_red"> <TextView @@ -36,13 +36,13 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:singleLine="true" - android:layout_marginTop="10dip" + android:layout_marginTop="10dp" android:textSize="20sp" android:textColor="#ffffff" android:layout_gravity="center" android:visibility="invisible"/> <RelativeLayout - android:layout_height="0dip" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1.0"> <com.android.inputmethod.deprecated.voice.SoundIndicator @@ -65,8 +65,8 @@ android:id="@+id/progress" android:indeterminate="true" android:indeterminateOnly="false" - android:layout_height="60dip" - android:layout_width="60dip" + android:layout_height="60dp" + android:layout_width="60dp" android:layout_centerInParent="true" android:visibility="gone"/> </RelativeLayout> @@ -82,15 +82,15 @@ android:layout_width="wrap_content" android:singleLine="true" android:textSize="15sp" - android:layout_marginTop="3dip" - android:layout_marginBottom="3dip" + android:layout_marginTop="3dp" + android:layout_marginBottom="3dp" android:layout_gravity="center" android:textColor="#ffffff" android:visibility="invisible"/> <Button android:id="@+id/button" android:layout_width="match_parent" - android:layout_height="30dip" + android:layout_height="30dp" android:singleLine="true" android:focusable="true" android:text="@string/cancel" diff --git a/java/res/layout/sound_effect_volume_dialog.xml b/java/res/layout/sound_effect_volume_dialog.xml index c5b2f10e2..294663006 100644 --- a/java/res/layout/sound_effect_volume_dialog.xml +++ b/java/res/layout/sound_effect_volume_dialog.xml @@ -23,22 +23,22 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <TextView android:id="@+id/sound_effect_volume_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20dip"/> + android:textSize="20dp"/> </LinearLayout> <SeekBar android:id="@+id/sound_effect_volume_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" - android:layout_margin="10dip"/> + android:layout_margin="10dp"/> </LinearLayout> diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml index a364d46aa..a4ad6df25 100644 --- a/java/res/layout/suggestion_info.xml +++ b/java/res/layout/suggestion_info.xml @@ -22,6 +22,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="6sp" + android:textSize="6dp" android:textColor="@android:color/white" style="?attr/suggestionBackgroundStyle" /> diff --git a/java/res/layout/suggestion_preview.xml b/java/res/layout/suggestion_preview.xml index 3c026ae0e..856447bba 100644 --- a/java/res/layout/suggestion_preview.xml +++ b/java/res/layout/suggestion_preview.xml @@ -21,8 +21,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp" + android:textSize="18dp" android:textColor="?android:attr/textColorPrimaryInverse" - android:minWidth="32dip" + android:minWidth="32dp" android:gravity="center" style="?attr/suggestionPreviewBackgroundStyle" /> diff --git a/java/res/layout/vibration_settings_dialog.xml b/java/res/layout/vibration_settings_dialog.xml index 981ba9be0..c9fb6ec4e 100644 --- a/java/res/layout/vibration_settings_dialog.xml +++ b/java/res/layout/vibration_settings_dialog.xml @@ -23,27 +23,27 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <TextView android:id="@+id/vibration_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20dip"/> + android:textSize="20dp"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/settings_ms" - android:textSize="20dip"/> + android:textSize="20dp"/> </LinearLayout> <SeekBar android:id="@+id/vibration_settings" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="250" - android:layout_margin="10dip"/> + android:layout_margin="10dp"/> </LinearLayout> diff --git a/java/res/layout/voice_punctuation_hint.xml b/java/res/layout/voice_punctuation_hint.xml index 629a7f2b5..b32feb6e2 100644 --- a/java/res/layout/voice_punctuation_hint.xml +++ b/java/res/layout/voice_punctuation_hint.xml @@ -29,8 +29,8 @@ <ImageView android:id="@+id/image" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingLeft="8dip" - android:paddingRight="8dip" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:layout_gravity="center_horizontal" android:src="@drawable/ic_suggest_strip_microphone" /> @@ -39,8 +39,8 @@ android:text="@string/voice_punctuation_hint" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingTop="2dip" - android:paddingRight="3dip" + android:paddingTop="2dp" + android:paddingRight="3dp" android:textSize="13sp" android:textColor="#888888" android:layout_gravity="center_horizontal" diff --git a/java/res/layout/voice_swipe_hint.xml b/java/res/layout/voice_swipe_hint.xml index 4e8859a71..b1e27c281 100644 --- a/java/res/layout/voice_swipe_hint.xml +++ b/java/res/layout/voice_swipe_hint.xml @@ -25,14 +25,14 @@ android:layout_height="wrap_content" android:background="@drawable/keyboard_suggest_strip" android:gravity="center_horizontal" - android:paddingTop="2dip"> + android:paddingTop="2dp"> <TextView android:id="@+id/text" android:text="@string/voice_swipe_hint" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingTop="10dip" - android:paddingRight="6dip" + android:paddingTop="10dp" + android:paddingRight="6dp" android:textSize="13sp" android:textColor="#888888" android:layout_gravity="center_horizontal" diff --git a/java/res/values-en/additional-proximitychars.xml b/java/res/values-en/additional-proximitychars.xml deleted file mode 100644 index a5ff4a979..000000000 --- a/java/res/values-en/additional-proximitychars.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <string-array name="additional_proximitychars"> - <!-- Empty entry terminates the proximity chars array. --> - - <!-- Additional proximity chars for a --> - <item>a</item> - <item>e</item> - <item>i</item> - <item>o</item> - <item>u</item> - <item></item> - <!-- Additional proximity chars for e --> - <item>e</item> - <item>a</item> - <item>i</item> - <item>o</item> - <item>u</item> - <item></item> - <!-- Additional proximity chars for i --> - <item>i</item> - <item>a</item> - <item>e</item> - <item>o</item> - <item>u</item> - <item></item> - <!-- Additional proximity chars for o --> - <item>o</item> - <item>a</item> - <item>e</item> - <item>i</item> - <item>u</item> - <item></item> - <!-- Additional proximity chars for u --> - <item>u</item> - <item>a</item> - <item>e</item> - <item>i</item> - <item>o</item> - <item></item> - </string-array> - -</resources> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index 73192d944..6cdcf891c 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -44,7 +44,7 @@ <fraction name="key_horizontal_gap_ics">1.020%p</fraction> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">8dip</dimen> + <dimen name="key_label_horizontal_padding">8dp</dimen> <fraction name="key_letter_ratio">65%</fraction> <fraction name="key_large_letter_ratio">74%</fraction> @@ -60,8 +60,8 @@ <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-0.140in</dimen> - <dimen name="suggestions_strip_height">36dip</dimen> - <dimen name="more_suggestions_row_height">36dip</dimen> + <dimen name="suggestions_strip_height">36dp</dimen> + <dimen name="more_suggestions_row_height">36dp</dimen> <integer name="max_more_suggestions_row">2</integer> <fraction name="min_more_suggestions_width">60%</fraction> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 68083b534..5dce47ee3 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -40,7 +40,7 @@ <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dp</dimen> <fraction name="key_letter_ratio">45%</fraction> <fraction name="key_large_letter_ratio">48%</fraction> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index a86102421..0f256a302 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -40,7 +40,7 @@ <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> - <dimen name="more_keys_keyboard_key_horizontal_padding">6dip</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> @@ -48,7 +48,7 @@ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="key_uppercase_letter_padding">3dp</dimen> @@ -63,18 +63,17 @@ <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> - <dimen name="suggestions_strip_height">44dip</dimen> - <dimen name="more_suggestions_row_height">44dip</dimen> + <dimen name="suggestions_strip_height">44dp</dimen> + <dimen name="more_suggestions_row_height">44dp</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <dimen name="suggestions_strip_padding">15.0mm</dimen> <dimen name="suggestion_min_width">0.3in</dimen> - <dimen name="suggestion_padding">12dip</dimen> - <dimen name="suggestion_text_size">22dip</dimen> - <dimen name="more_suggestions_hint_text_size">33dip</dimen> + <dimen name="suggestion_padding">12dp</dimen> + <dimen name="suggestion_text_size">22dp</dimen> + <dimen name="more_suggestions_hint_text_size">33dp</dimen> </resources> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index ef39f4393..535c62308 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -44,7 +44,7 @@ <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dp</dimen> <fraction name="key_letter_ratio">43%</fraction> <fraction name="key_large_letter_ratio">42%</fraction> @@ -55,7 +55,6 @@ <fraction name="spacebar_text_ratio">24.00%</fraction> <dimen name="key_preview_height">17.0mm</dimen> - <dimen name="key_preview_height_ics">26.5mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="suggestions_strip_padding">40.0mm</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index a9ad030fe..7aefa26af 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -43,7 +43,7 @@ <dimen name="popup_key_height">10.0mm</dimen> - <dimen name="more_keys_keyboard_key_horizontal_padding">12dip</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> @@ -51,7 +51,7 @@ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="key_uppercase_letter_padding">3dp</dimen> @@ -66,18 +66,17 @@ <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> - <dimen name="suggestions_strip_height">44dip</dimen> - <dimen name="more_suggestions_row_height">44dip</dimen> + <dimen name="suggestions_strip_height">44dp</dimen> + <dimen name="more_suggestions_row_height">44dp</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <dimen name="suggestions_strip_padding">15.0mm</dimen> - <dimen name="suggestion_min_width">46dip</dimen> - <dimen name="suggestion_padding">8dip</dimen> - <dimen name="suggestion_text_size">22dip</dimen> - <dimen name="more_suggestions_hint_text_size">33dip</dimen> + <dimen name="suggestion_min_width">46dp</dimen> + <dimen name="suggestion_padding">8dp</dimen> + <dimen name="suggestion_text_size">22dp</dimen> + <dimen name="more_suggestions_hint_text_size">33dp</dimen> </resources> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 37720ce72..5f74fa746 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -26,8 +26,8 @@ <dimen name="popup_key_height">0.330in</dimen> - <dimen name="more_keys_keyboard_horizontal_edges_padding">16dip</dimen> - <dimen name="more_keys_keyboard_key_horizontal_padding">8dip</dimen> + <dimen name="more_keys_keyboard_horizontal_edges_padding">16dp</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen> <fraction name="keyboard_top_padding">1.556%p</fraction> <fraction name="keyboard_bottom_padding">4.669%p</fraction> @@ -48,7 +48,7 @@ <fraction name="keyboard_bottom_padding_ics">4.669%p</fraction> <fraction name="key_bottom_gap_ics">6.127%p</fraction> <fraction name="key_horizontal_gap_ics">1.739%p</fraction> - <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dip</dimen> + <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -67,33 +67,32 @@ <fraction name="key_uppercase_letter_ratio">35%</fraction> <fraction name="key_preview_text_ratio">82%</fraction> <fraction name="spacebar_text_ratio">33.735%</fraction> - <dimen name="key_preview_height">80sp</dimen> + <dimen name="key_preview_height">80dp</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_label_horizontal_padding">4dip</dimen> + <dimen name="key_label_horizontal_padding">4dp</dimen> <dimen name="key_hint_letter_padding">1dp</dimen> <dimen name="key_popup_hint_letter_padding">2dp</dimen> <dimen name="key_uppercase_letter_padding">2dp</dimen> - <dimen name="key_preview_height_ics">80sp</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-0.165in</dimen> - <dimen name="suggestions_strip_height">40dip</dimen> - <dimen name="more_suggestions_key_horizontal_padding">12dip</dimen> - <dimen name="more_suggestions_row_height">40dip</dimen> - <dimen name="more_suggestions_bottom_gap">6dip</dimen> + <dimen name="suggestions_strip_height">40dp</dimen> + <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen> + <dimen name="more_suggestions_row_height">40dp</dimen> + <dimen name="more_suggestions_bottom_gap">6dp</dimen> <dimen name="more_suggestions_modal_tolerance">0.2in</dimen> <dimen name="more_suggestions_slide_allowance">0.1in</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <fraction name="more_suggestions_info_ratio">18%</fraction> - <dimen name="suggestions_strip_padding">0dip</dimen> - <dimen name="suggestion_min_width">44dip</dimen> - <dimen name="suggestion_padding">6dip</dimen> - <dimen name="suggestion_text_size">18dip</dimen> - <dimen name="more_suggestions_hint_text_size">27dip</dimen> + <dimen name="suggestions_strip_padding">0dp</dimen> + <dimen name="suggestion_min_width">44dp</dimen> + <dimen name="suggestion_padding">6dp</dimen> + <dimen name="suggestion_text_size">18dp</dimen> + <dimen name="more_suggestions_hint_text_size">27dp</dimen> <integer name="suggestions_count_in_strip">3</integer> <integer name="center_suggestion_percentile">36</integer> </resources> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 7d8b7ddf2..5628f271c 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -95,9 +95,9 @@ name="MoreKeysKeyboard" parent="Keyboard" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView" @@ -205,9 +205,9 @@ name="MoreKeysKeyboard.Stone" parent="Keyboard.Stone" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.Stone" @@ -274,9 +274,9 @@ name="MoreKeysKeyboard.Gingerbread" parent="Keyboard.Gingerbread" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.Gingerbread" @@ -315,7 +315,6 @@ <item name="keyPreviewBackgroundWidth">@dimen/keyboard_key_feedback_background_holo_width</item> <item name="keyPreviewBackgroundHeight">@dimen/keyboard_key_feedback_background_holo_height</item> <item name="keyPreviewTextColor">#FFFFFFFF</item> - <item name="keyPreviewHeight">@dimen/key_preview_height_ics</item> <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item> <item name="shadowColor">#00000000</item> <item name="shadowRadius">0.0</item> @@ -334,9 +333,9 @@ name="MoreKeysKeyboard.IceCreamSandwich" parent="Keyboard.IceCreamSandwich" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.IceCreamSandwich" diff --git a/java/res/values/sudden-jumping-touch-event-device-list.xml b/java/res/values/sudden-jumping-touch-event-device-list.xml index ba828a758..543992a81 100644 --- a/java/res/values/sudden-jumping-touch-event-device-list.xml +++ b/java/res/values/sudden-jumping-touch-event-device-list.xml @@ -19,9 +19,9 @@ --> <resources> <string-array name="sudden_jumping_touch_event_device_list" translatable="false"> - <!-- Nexus One --> - <item>mahimahi</item> - <!-- Droid --> - <item>sholes</item> + <!-- "Build.HARDWARE,true" that needs "sudden jump touch event" hack. + See {@link com.android.inputmethod.keyboard.SuddenJumpingTouchEventHandler}. --> + <item>mahimahi,true</item> <!-- Nexus One --> + <item>sholes,true</item> <!-- Droid --> </string-array> </resources> diff --git a/java/res/xml-hi/keyboard_set.xml b/java/res/xml-hi/keyboard_set.xml new file mode 100644 index 000000000..804323a31 --- /dev/null +++ b/java/res/xml-hi/keyboard_set.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<KeyboardSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyboardLocale="hi"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_hindi" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardSet> diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml new file mode 100644 index 000000000..6bec7f0b5 --- /dev/null +++ b/java/res/xml-sw600dp/rows_hindi.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="7.6%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_hindi1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.6%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_hindi2" + latin:keyXPos="4.500%p" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="6.923%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_hindi3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <include + latin:keyboardLayout="@xml/key_smiley" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw768dp/rows_hindi.xml b/java/res/xml-sw768dp/rows_hindi.xml new file mode 100644 index 000000000..bb1884227 --- /dev/null +++ b/java/res/xml-sw768dp/rows_hindi.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="7.333%p" + > + <Key + latin:keyStyle="tabKeyStyle" + latin:keyLabelFlags="alignLeft" /> + <include + latin:keyboardLayout="@xml/rowkeys_hindi1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.194%p" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyLabelFlags="alignLeft" + latin:keyWidth="9.375%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_hindi2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.135%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="14.375%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_hindi3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/values/additional-proximitychars.xml b/java/res/xml/kbd_hindi.xml index 03d10d5d8..0e69e3ae2 100644 --- a/java/res/values/additional-proximitychars.xml +++ b/java/res/xml/kbd_hindi.xml @@ -17,7 +17,10 @@ ** limitations under the License. */ --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="additional_proximitychars"> - </string-array> -</resources> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/rows_hindi" /> +</Keyboard> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index cdcea0ed0..077574f34 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -38,6 +38,7 @@ fr: French/azerty fr_CA: French Canada/qwerty fr_CH: French Switzerland/qwertz + hi: Hindi/hindi hr: Croatian/qwertz hu: Hungarian/qwertz it: Italian/qwerty @@ -171,6 +172,12 @@ /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:imeSubtypeLocale="hi" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="SupportTouchPositionCorrection" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" android:imeSubtypeLocale="hr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml new file mode 100644 index 000000000..4f7a4148c --- /dev/null +++ b/java/res/xml/rowkeys_hindi1.xml @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <!-- U+0914: "औ" DEVANAGARI LETTER AU + U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA + U+0967: "१" DEVANAGARI DIGIT ONE --> + <Key + latin:keyLabel="औ" + latin:moreKeys="ऒं,%" + latin:keyHintLabel="1" + latin:additionalMoreKeys="१,1" /> + <!-- U+0910: "ऐ" DEVANAGARI LETTER AI + U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA + U+0968: "२" DEVANAGARI DIGIT TWO --> + <Key + latin:keyLabel="ऐ" + latin:moreKeys="ऐं,%" + latin:keyHintLabel="2" + latin:additionalMoreKeys="२,2" /> + <!-- U+0906: "आ" DEVANAGARI LETTER AA + U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA + U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU + U+0969: "३" DEVANAGARI DIGIT THREE --> + <Key + latin:keyLabel="आ" + latin:moreKeys="आं,आँ,%" + latin:keyHintLabel="3" + latin:additionalMoreKeys="३,3" /> + <!-- U+0908: "ई" DEVANAGARI LETTER II + U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA + U+096A: "४" DEVANAGARI DIGIT FOUR --> + <Key + latin:keyLabel="ई" + latin:moreKeys="ईं,%" + latin:keyHintLabel="4" + latin:additionalMoreKeys="४,4" /> + <!-- U+090A: "ऊ" DEVANAGARI LETTER UU + U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA + U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU + U+096B: "५" DEVANAGARI DIGIT FIVE --> + <Key + latin:keyLabel="ऊ" + latin:moreKeys="ऊं,ऊँ,%" + latin:keyHintLabel="5" + latin:additionalMoreKeys="५,5" /> + <!-- U+092D: "भ" DEVANAGARI LETTER BHA + U+096C: "६" DEVANAGARI DIGIT SIX --> + <Key + latin:keyLabel="भ" + latin:keyHintLabel="6" + latin:additionalMoreKeys="६,6" /> + <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA + U+096D: "७" DEVANAGARI DIGIT SEVEN --> + <Key + latin:keyLabel="ः" + latin:keyHintLabel="7" + latin:additionalMoreKeys="७,7" /> + <!-- U+0918: "घ" DEVANAGARI LETTER GHA + U+096E: "८" DEVANAGARI DIGIT EIGHT --> + <Key + latin:keyLabel="घ" + latin:keyHintLabel="8" + latin:additionalMoreKeys="८,8" /> + <!-- U+0927: "ध" DEVANAGARI LETTER DHA + U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA + U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA + U+096F: "९" DEVANAGARI DIGIT NINE --> + <Key + latin:keyLabel="ध" + latin:moreKeys="क्ष,श्र,%" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+091D: "झ" DEVANAGARI LETTER JHA + U+0966: "०" DEVANAGARI DIGIT ZERO --> + <Key + latin:keyLabel="झ" + latin:keyHintLabel="0" + latin:additionalMoreKeys="०,0" /> + <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA --> + <Key + latin:keyLabel="ढ" /> + </case> + <default> + <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU + U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA + U+0967: "१" DEVANAGARI DIGIT ONE --> + <Key + latin:keyLabel="ौ" + latin:moreKeys="ौं,%" + latin:keyHintLabel="1" + latin:additionalMoreKeys="१,1" /> + <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI + U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA + U+0968: "२" DEVANAGARI DIGIT TWO --> + <Key + latin:keyLabel="ै" + latin:moreKeys="ैं,%" + latin:keyHintLabel="2" + latin:additionalMoreKeys="२,2" /> + <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA + U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA + U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU + U+0969: "३" DEVANAGARI DIGIT THREE --> + <Key + latin:keyLabel="ा" + latin:moreKeys="ां,ाँ,%" + latin:keyHintLabel="3" + latin:additionalMoreKeys="३,3" /> + <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II + U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA + U+096A: "४" DEVANAGARI DIGIT FOUR --> + <Key + latin:keyLabel="ी" + latin:moreKeys="ीं,%" + latin:keyHintLabel="4" + latin:additionalMoreKeys="४,4" /> + <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU + U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA + U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU + U+096B: "५" DEVANAGARI DIGIT FIVE --> + <Key + latin:keyLabel="ू" + latin:moreKeys="ूं,ूँ,%" + latin:keyHintLabel="5" + latin:additionalMoreKeys="५,5" /> + <!-- U+092C: "ब" DEVANAGARI LETTER BA + U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA --> + <Key + latin:keyLabel="ब" + latin:moreKeys="ब॒,%" + latin:keyHintLabel="6" + latin:additionalMoreKeys="६,6" /> + <!-- U+0939: "ह" DEVANAGARI LETTER HA + U+096D: "७" DEVANAGARI DIGIT SEVEN --> + <Key + latin:keyLabel="ह" + latin:keyHintLabel="7" + latin:additionalMoreKeys="७,7" /> + <!-- U+0917: "ग" DEVANAGARI LETTER GA + U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA + U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA + U+0917/U+0952: "ग॒" DEVANAGARI LETTER GA/DEVANAGARI STRESS SIGN ANUDATTA + U+096E: "८" DEVANAGARI DIGIT EIGHT --> + <Key + latin:keyLabel="ग" + latin:moreKeys="ज्ञ,ग़,ग॒,%" + latin:keyHintLabel="8" + latin:additionalMoreKeys="८,8" /> + <!-- U+0926: "द" DEVANAGARI LETTER DA + U+096F: "९" DEVANAGARI DIGIT NINE --> + <Key + latin:keyLabel="द" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+091C: "ज" DEVANAGARI LETTER JA + U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA + U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA + U+091C/U+093C: "ज़" DEVANAGARI LETTER JA/DEVANAGARI SIGN NUKTA + U+0966: "०" DEVANAGARI DIGIT ZERO --> + <Key + latin:keyLabel="ज" + latin:moreKeys="ज॒,ज्ञ,ज़,%" + latin:keyHintLabel="0" + latin:additionalMoreKeys="०,0" /> + <!-- U+0921: "ड" DEVANAGARI LETTER DDA + U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA + U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA --> + <Key + latin:keyLabel="ड" + latin:moreKeys="ड॒,ड़" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml new file mode 100644 index 000000000..1bf6fd4df --- /dev/null +++ b/java/res/xml/rowkeys_hindi2.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <!-- U+0913: "ओ" DEVANAGARI LETTER O + U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA + U+0911: "ऑ" DEVANAGARI LETTER CANDRA O + U+0912: "ऒ" DEVANAGARI LETTER SHORT O --> + <Key + latin:keyLabel="ओ" + latin:moreKeys="ओं,ऑ,ऒ" /> + <!-- U+090F: "ए" DEVANAGARI LETTER E + U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA + U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU + U+090D: "ऍ" DEVANAGARI LETTER CANDRA E + U+090E: "ऎ" DEVANAGARI LETTER SHORT E --> + <Key + latin:keyLabel="ए" + latin:moreKeys="एं,एँ,ऍ,ऎ" /> + <!-- U+0905: "अ" DEVANAGARI LETTER A + U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA + U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU --> + <Key + latin:keyLabel="अ" + latin:moreKeys="अं,अँ" /> + <!-- U+0907: "इ" DEVANAGARI LETTER I + U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA + U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU --> + <Key + latin:keyLabel="इ" + latin:moreKeys="इं,इँ" /> + <!-- U+0909: "उ" DEVANAGARI LETTER U + U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA + U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU --> + <Key + latin:keyLabel="उ" + latin:moreKeys="उं,उँ" /> + <!-- U+092B: "फ" DEVANAGARI LETTER PHA + U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA --> + <Key + latin:keyLabel="फ" + latin:moreKeys="फ़" /> + <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA + U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA + U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA --> + <Key + latin:keyLabel="ऱ" + latin:moreKeys="्र,र्" /> + <!-- U+0916: "ख" DEVANAGARI LETTER KHA + U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA --> + <Key + latin:keyLabel="ख" + latin:moreKeys="ख़" /> + <!-- U+0925: "थ" DEVANAGARI LETTER THA --> + <Key + latin:keyLabel="थ" /> + <!-- U+091B: "छ" DEVANAGARI LETTER CHA --> + <Key + latin:keyLabel="छ" /> + <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA --> + <Key + latin:keyLabel="ठ" /> + </case> + <default> + <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O + U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA + U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O + U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> + <Key + latin:keyLabel="ो" + latin:moreKeys="ों,ॉ,ॊ" /> + <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E + U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA --> + <Key + latin:keyLabel="े" + latin:moreKeys="ें" /> + <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> + <Key + latin:keyLabel="्" /> + <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I + U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA --> + <Key + latin:keyLabel="ि" + latin:moreKeys="िं" /> + <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U + U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA + U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU --> + <Key + latin:keyLabel="ु" + latin:moreKeys="ुं,ुँ" /> + <!-- U+092A: "प" DEVANAGARI LETTER PA --> + <Key + latin:keyLabel="प" /> + <!-- U+0930: "र" DEVANAGARI LETTER RA + U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R + U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA + U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR --> + <Key + latin:keyLabel="र" + latin:moreKeys="ऋ,ऱ,ॠ" /> + <!-- U+0915: "क" DEVANAGARI LETTER KA + U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA --> + <Key + latin:keyLabel="क" + latin:moreKeys="क़" /> + <!-- U+0924: "त" DEVANAGARI LETTER TA + U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> + <Key + latin:keyLabel="त" + latin:moreKeys="त्र" /> + <!-- U+091A: "च" DEVANAGARI LETTER CA --> + <Key + latin:keyLabel="च" /> + <!-- U+091F: "ट" DEVANAGARI LETTER TTA --> + <Key + latin:keyLabel="ट" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml new file mode 100644 index 000000000..e6b430f1b --- /dev/null +++ b/java/res/xml/rowkeys_hindi3.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> + <Key + latin:keyLabel="ऑ" /> + <!-- U+090E: "ऎ" DEVANAGARI LETTER SHORT E --> + <Key + latin:keyLabel="ऎ" /> + <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU + U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E--> + <Key + latin:keyLabel="ँ" + latin:moreKeys="ॅ" /> + <!-- U+0923: "ण" DEVANAGARI LETTER NNA --> + <Key + latin:keyLabel="ण" /> + <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA --> + <Key + latin:keyLabel="ऩ" /> + <!-- U+0933: "ळ" DEVANAGARI LETTER LLA + U+0934: "ऴ" DEVANAGARI LETTER LLLA --> + <Key + latin:keyLabel="ळ" + latin:moreKeys="ऴ" /> + <!-- U+0936: "श" DEVANAGARI LETTER SHA --> + <Key + latin:keyLabel="श" /> + <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> + <Key + latin:keyLabel="ष" /> + <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R + U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> + <Key + latin:keyLabel="ृ" + latin:moreKeys="ॄ" /> + <!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> + <Key + latin:keyLabel="ञ" /> + </case> + <default> + <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> + <Key + latin:keyLabel="ॉ" /> + <!-- U+0946: "ॆ" DEVANAGARI VOWEL SIGN SHORT E --> + <Key + latin:keyLabel="ॆ" /> + <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> + <Key + latin:keyLabel="ं" /> + <!-- U+092E: "म" DEVANAGARI LETTER MA + U+0950: "ॐ" DEVANAGARI OM --> + <Key + latin:keyLabel="म" + latin:moreKeys="ॐ" /> + <!-- U+0928: "न" DEVANAGARI LETTER NA + U+091E: "ञ" DEVANAGARI LETTER NYA + U+0919: "ङ" DEVANAGARI LETTER NGA + U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA --> + <Key + latin:keyLabel="न" + latin:moreKeys="ञ,ङ,ऩ" /> + <!-- U+0935: "व" DEVANAGARI LETTER VA --> + <Key + latin:keyLabel="व" /> + <!-- U+0932: "ल" DEVANAGARI LETTER LA + U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L + U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL --> + <Key + latin:keyLabel="ल" + latin:moreKeys="ऌ,ॡ" /> + <!-- U+0938: "स" DEVANAGARI LETTER SA --> + <Key + latin:keyLabel="स" /> + <!-- U+092F: "य" DEVANAGARI LETTER YA + U+095F: "य़" DEVANAGARI LETTER YYA --> + <Key + latin:keyLabel="य" + latin:moreKeys="य़" /> + <!-- U+093C: "़" DEVANAGARI SIGN NUKTA + U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP + U+0970: "॰" DEVANAGARI ABBREVIATION SIGN + U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> + <Key + latin:keyLabel="़" + latin:moreKeys="ॽ,॰,ऽ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml new file mode 100644 index 000000000..42d89b546 --- /dev/null +++ b/java/res/xml/rows_hindi.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_hindi1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_hindi2" /> + </Row> + <Row + latin:keyWidth="7.65%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="11.75%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_hindi3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> |