Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d2ab10d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use "dp" instead of "sp""

parents 32aac477 a6dd0c27

java/res/layout/key_preview.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"

    />

java/res/layout/suggestion_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

java/res/layout/suggestion_preview.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

java/res/values-sw600dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
    <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>

java/res/values-sw768dp-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>