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

Commit 88517c68 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Tweak Dialpad redlines" into klp-dev

parents 4f2acb61 77840873

res/drawable-hdpi/ic_dial_action_vm.png

+167 B (727 B)
Loading image diff...

res/drawable-mdpi/ic_dial_action_vm.png

+82 B (522 B)
Loading image diff...

res/drawable-xhdpi/ic_dial_action_vm.png

+206 B (929 B)
Loading image diff...

res/layout/dialpad.xml

+23 −18
Original line number Diff line number Diff line
@@ -37,23 +37,26 @@ 
            android:id="@+id/one"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            <LinearLayout

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center" >

                <TextView

                    android:id="@+id/dialpad_key_number"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:textColor="@color/dialpad_primary_text_color"

                    android:textSize="@dimen/dialpad_key_numbers_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

                    android:fontFamily="sans-serif-light"/>

                <ImageView

                    android:id="@+id/dialpad_key_voicemail"

                android:layout_width="wrap_content"

                    android:layout_width="@dimen/dialpad_key_letters_width"

                    android:layout_height="wrap_content"

                    android:src="@drawable/ic_dial_action_vm"

                android:paddingRight="11dp"

                android:layout_alignBaseline="@id/dialpad_key_number"

                android:baselineAlignBottom="true"

                android:layout_alignParentRight="true" />

                    android:paddingLeft="11dp"

                    android:scaleType="fitStart"

                    android:baselineAlignBottom="true" />

            </LinearLayout>

        </com.android.dialer.dialpad.DialpadKeyButton>

        <include layout="@layout/dialpad_key" android:id="@+id/two"/>

        <include layout="@layout/dialpad_key" android:id="@+id/three"/>
@@ -90,7 +93,8 @@ 
                android:textColor="@color/dialpad_secondary_text_color"

                android:textSize="@dimen/dialpad_key_special_characters_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

                android:paddingRight="@dimen/dialpad_key_letters_width"

                android:layout_gravity="center" />

        </com.android.dialer.dialpad.DialpadKeyButton>

        <include layout="@layout/dialpad_key" android:id="@+id/zero"/>

        <com.android.dialer.dialpad.DialpadKeyButton
@@ -105,7 +109,8 @@ 
                android:textColor="@color/dialpad_secondary_text_color"

                android:textSize="@dimen/dialpad_key_special_characters_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

                android:paddingRight="@dimen/dialpad_key_letters_width"

                android:layout_gravity="center" />

        </com.android.dialer.dialpad.DialpadKeyButton>

    </TableRow>

</TableLayout>

res/layout/dialpad_key.xml

+21 −19
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/DialtactsDialpadButtonStyle"

    android:clickable="true" >

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="center">

      <TextView

          android:id="@+id/dialpad_key_number"

          android:layout_width="wrap_content"
@@ -26,17 +30,15 @@ 
          android:textColor="@color/dialpad_primary_text_color"

          android:textSize="@dimen/dialpad_key_numbers_size"

          android:fontFamily="sans-serif-light"

        android:layout_centerInParent="true"

          />

      <TextView

          android:id="@+id/dialpad_key_letters"

        android:layout_width="wrap_content"

          android:layout_width="@dimen/dialpad_key_letters_width"

          android:layout_height="wrap_content"

          android:textColor="@color/dialpad_secondary_text_color"

          android:textSize="@dimen/dialpad_key_letters_size"

        android:paddingRight="11dp"

        android:layout_alignBaseline="@id/dialpad_key_number"

          android:paddingLeft="11dp"

          android:fontFamily="sans-serif-light"

        android:layout_alignParentRight="true"

          />

    </LinearLayout>

</com.android.dialer.dialpad.DialpadKeyButton>
 
 No newline at end of file