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

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

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

parents 3d2ab10d 7c38b73f

java/res/layout-sw768dp/recognition_status.xml

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

java/res/layout/input_view.xml

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

java/res/layout/recognition_status.xml

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

java/res/layout/sound_effect_volume_dialog.xml

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

java/res/layout/vibration_settings_dialog.xml

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