Merge "Use "dp" instead of "dip""

main
Tadashi G. Takaoka 2012-03-21 04:05:21 -07:00 committed by Android (Google) Code Review
commit 26e7ce1fa8
14 changed files with 79 additions and 79 deletions

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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. -->

View File

@ -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>

View File

@ -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>
@ -67,13 +67,13 @@
<!-- 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>

View File

@ -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>

View File

@ -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>
@ -70,13 +70,13 @@
<!-- 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>

View File

@ -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 -->
@ -70,7 +70,7 @@
<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>
@ -79,20 +79,20 @@
<!-- 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>

View File

@ -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"
@ -333,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"