diff options
Diffstat (limited to 'java')
26 files changed, 153 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-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/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 847174c0a..24eb7592b 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -99,7 +99,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Main keyboard private Keyboard mKeyboard; - private final KeyDrawParams mKeyDrawParams; + protected final KeyDrawParams mKeyDrawParams; // Key preview private final int mKeyPreviewLayoutId; @@ -171,7 +171,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { } } - /* package */ static class KeyDrawParams { + protected static class KeyDrawParams { // XML attributes public final int mKeyTextColor; public final int mKeyTextInactivatedColor; @@ -351,7 +351,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { mDelayAfterPreview = mKeyPreviewDrawParams.mLingerTimeout; mPaint.setAntiAlias(true); - mPaint.setTextAlign(Align.CENTER); } // Read fraction value in TypedArray as float. @@ -729,10 +728,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { } } - private static int getCharGeometryCacheKey(char reference, Paint paint) { + private static int getCharGeometryCacheKey(char referenceChar, Paint paint) { final int labelSize = (int)paint.getTextSize(); final Typeface face = paint.getTypeface(); - final int codePointOffset = reference << 15; + final int codePointOffset = referenceChar << 15; if (face == Typeface.DEFAULT) { return codePointOffset + labelSize; } else if (face == Typeface.DEFAULT_BOLD) { @@ -747,41 +746,35 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Working variable for the following methods. private final Rect mTextBounds = new Rect(); - private float getCharHeight(char[] character, Paint paint) { - final Integer key = getCharGeometryCacheKey(character[0], paint); + private float getCharHeight(char[] referenceChar, Paint paint) { + final Integer key = getCharGeometryCacheKey(referenceChar[0], paint); final Float cachedValue = sTextHeightCache.get(key); if (cachedValue != null) return cachedValue; - paint.getTextBounds(character, 0, 1, mTextBounds); + paint.getTextBounds(referenceChar, 0, 1, mTextBounds); final float height = mTextBounds.height(); sTextHeightCache.put(key, height); return height; } - private float getCharWidth(char[] character, Paint paint) { - final Integer key = getCharGeometryCacheKey(character[0], paint); + private float getCharWidth(char[] referenceChar, Paint paint) { + final Integer key = getCharGeometryCacheKey(referenceChar[0], paint); final Float cachedValue = sTextWidthCache.get(key); if (cachedValue != null) return cachedValue; - paint.getTextBounds(character, 0, 1, mTextBounds); + paint.getTextBounds(referenceChar, 0, 1, mTextBounds); final float width = mTextBounds.width(); sTextWidthCache.put(key, width); return width; } - protected float getLabelWidth(CharSequence label, Paint paint) { + public float getLabelWidth(String label, Paint paint) { paint.getTextBounds(label.toString(), 0, label.length(), mTextBounds); return mTextBounds.width(); } - public float getDefaultLabelWidth(String label, Paint paint) { - paint.setTextSize(mKeyDrawParams.mKeyLabelSize); - paint.setTypeface(mKeyDrawParams.mKeyTextStyle); - return getLabelWidth(label, paint); - } - protected static void drawIcon(Canvas canvas, Drawable icon, int x, int y, int width, int height) { canvas.translate(x, y); @@ -815,6 +808,14 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { canvas.translate(-x, -y); } + public Paint newDefaultLabelPaint() { + final Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setTypeface(mKeyDrawParams.mKeyTextStyle); + paint.setTextSize(mKeyDrawParams.mKeyLabelSize); + return paint; + } + public void cancelAllMessages() { mDrawingHandler.cancelAllMessages(); } diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java index 904a81de4..72a5d0f05 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java @@ -296,17 +296,16 @@ public class MoreKeysKeyboard extends Keyboard { final int padding = (int)(view.getResources() .getDimension(R.dimen.more_keys_keyboard_key_horizontal_padding) + (parentKey.hasLabelsInMoreKeys() ? minKeyWidth * LABEL_PADDING_RATIO : 0)); - Paint paint = null; + final Paint paint = view.newDefaultLabelPaint(); + paint.setTextSize(parentKey.hasLabelsInMoreKeys() + ? view.mKeyDrawParams.mKeyLabelSize + : view.mKeyDrawParams.mKeyLetterSize); int maxWidth = minKeyWidth; for (String moreKeySpec : parentKey.mMoreKeys) { final String label = KeySpecParser.getLabel(moreKeySpec); // If the label is single letter, minKeyWidth is enough to hold the label. if (label != null && StringUtils.codePointCount(label) > 1) { - if (paint == null) { - paint = new Paint(); - paint.setAntiAlias(true); - } - final int width = (int)view.getDefaultLabelWidth(label, paint) + padding; + final int width = (int)view.getLabelWidth(label, paint) + padding; if (maxWidth < width) { maxWidth = width; } diff --git a/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java b/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java index 62a9259f9..347383f95 100644 --- a/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java +++ b/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java @@ -17,12 +17,12 @@ package com.android.inputmethod.keyboard; import android.content.Context; -import android.os.Build; import android.util.Log; import android.view.MotionEvent; import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.R; +import com.android.inputmethod.latin.Utils; public class SuddenJumpingTouchEventHandler { private static final String TAG = SuddenJumpingTouchEventHandler.class.getSimpleName(); @@ -49,18 +49,8 @@ public class SuddenJumpingTouchEventHandler { public SuddenJumpingTouchEventHandler(Context context, ProcessMotionEvent view) { mView = view; - final String[] deviceList = context.getResources().getStringArray( - R.array.sudden_jumping_touch_event_device_list); - mNeedsSuddenJumpingHack = needsSuddenJumpingHack(Build.HARDWARE, deviceList); - } - - private static boolean needsSuddenJumpingHack(String deviceName, String[] deviceList) { - for (String device : deviceList) { - if (device.equalsIgnoreCase(deviceName)) { - return true; - } - } - return false; + mNeedsSuddenJumpingHack = Boolean.parseBoolean(Utils.getDeviceOverrideValue( + context.getResources(), R.array.sudden_jumping_touch_event_device_list, "false")); } public void setKeyboard(Keyboard newKeyboard) { diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index 9ffc7d0a2..8ec440500 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -196,8 +196,8 @@ public class BinaryDictionaryFileDumper { } finally { // Ignore exceptions while closing files. try { - // afd.close() will close inputStream, we should not call inputStream.close(). - if (null != afd) afd.close(); + // inputStream.close() will close afd, we should not call afd.close(). + if (null != inputStream) inputStream.close(); } catch (Exception e) { Log.e(TAG, "Exception while closing a cross-process file descriptor : " + e); } diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 9fc047b75..c1335fdfe 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -19,7 +19,6 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; -import android.os.Build; import android.util.Log; import android.view.inputmethod.EditorInfo; @@ -322,14 +321,8 @@ public class SettingsValues { return volume; } - final String[] volumePerHardwareList = res.getStringArray(R.array.keypress_volumes); - final String hardwarePrefix = Build.HARDWARE + ","; - for (final String element : volumePerHardwareList) { - if (element.startsWith(hardwarePrefix)) { - return Float.parseFloat(element.substring(element.lastIndexOf(',') + 1)); - } - } - return -1.0f; + return Float.parseFloat( + Utils.getDeviceOverrideValue(res, R.array.keypress_volumes, "-1.0f")); } // Likewise @@ -340,15 +333,9 @@ public class SettingsValues { if (ms >= 0) { return ms; } - final String[] durationPerHardwareList = res.getStringArray( - R.array.keypress_vibration_durations); - final String hardwarePrefix = Build.HARDWARE + ","; - for (final String element : durationPerHardwareList) { - if (element.startsWith(hardwarePrefix)) { - return (int)Long.parseLong(element.substring(element.lastIndexOf(',') + 1)); - } - } - return -1; + + return Integer.parseInt( + Utils.getDeviceOverrideValue(res, R.array.keypress_vibration_durations, "-1")); } // Likewise diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index 36a3d3061..e2ce08323 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -19,9 +19,11 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Resources; import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; @@ -43,6 +45,7 @@ import java.io.PrintWriter; import java.nio.channels.FileChannel; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; public class Utils { private Utils() { @@ -483,4 +486,23 @@ public class Utils { if (TextUtils.isEmpty(info)) return null; return info; } + + private static final String HARDWARE_PREFIX = Build.HARDWARE + ","; + private static final HashMap<Integer, String> sDeviceOverrideValueMap = + new HashMap<Integer, String>(); + + public static String getDeviceOverrideValue(Resources res, int overrideResId, String defValue) { + final Integer key = overrideResId; + if (!sDeviceOverrideValueMap.containsKey(key)) { + String overrideValue = defValue; + for (final String element : res.getStringArray(overrideResId)) { + if (element.startsWith(HARDWARE_PREFIX)) { + overrideValue = element.substring(HARDWARE_PREFIX.length()); + break; + } + } + sDeviceOverrideValueMap.put(key, overrideValue); + } + return sDeviceOverrideValueMap.get(key); + } } diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java index 3a17f1f64..dd83a0c4e 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java @@ -23,7 +23,6 @@ import android.graphics.drawable.Drawable; import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardSwitcher; -import com.android.inputmethod.keyboard.KeyboardView; import com.android.inputmethod.keyboard.internal.KeyboardIconsSet; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.SuggestedWords; @@ -53,10 +52,8 @@ public class MoreSuggestions extends Keyboard { public int mDividerWidth; public int layout(SuggestedWords suggestions, int fromPos, int maxWidth, int minWidth, - int maxRow, KeyboardView view) { + int maxRow, MoreSuggestionsView view) { clearKeys(); - final Paint paint = new Paint(); - paint.setAntiAlias(true); final Resources res = view.getContext().getResources(); mDivider = res.getDrawable(R.drawable.more_suggestions_divider); // TODO: Drawable itself should have an alpha value. @@ -64,6 +61,7 @@ public class MoreSuggestions extends Keyboard { mDividerWidth = mDivider.getIntrinsicWidth(); final int padding = (int) res.getDimension( R.dimen.more_suggestions_key_horizontal_padding); + final Paint paint = view.newDefaultLabelPaint(); int row = 0; int pos = fromPos, rowStartPos = fromPos; @@ -71,7 +69,7 @@ public class MoreSuggestions extends Keyboard { while (pos < size) { final String word = suggestions.getWord(pos).toString(); // TODO: Should take care of text x-scaling. - mWidths[pos] = (int)view.getDefaultLabelWidth(word, paint) + padding; + mWidths[pos] = (int)view.getLabelWidth(word, paint) + padding; final int numColumn = pos - rowStartPos + 1; final int columnWidth = (maxWidth - mDividerWidth * (numColumn - 1)) / numColumn; diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java index f11b1a4c1..e64e7a685 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java @@ -43,17 +43,17 @@ import com.android.inputmethod.latin.R; public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { private final int[] mCoordinates = new int[2]; - private final KeyDetector mModalPanelKeyDetector; + final KeyDetector mModalPanelKeyDetector; private final KeyDetector mSlidingPanelKeyDetector; private Controller mController; - private KeyboardActionListener mListener; + KeyboardActionListener mListener; private int mOriginX; private int mOriginY; - private static final TimerProxy EMPTY_TIMER_PROXY = new TimerProxy.Adapter(); + static final TimerProxy EMPTY_TIMER_PROXY = new TimerProxy.Adapter(); - private final KeyboardActionListener mSuggestionsPaneListener = + final KeyboardActionListener mSuggestionsPaneListener = new KeyboardActionListener.Adapter() { @Override public void onPressKey(int primaryCode) { |