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

Commit a8bf7969 authored by Andrew Lee's avatar Andrew Lee
Browse files

Add touch feedback to dialpad buttons. 

This is accomplished by replacing the old colors background with
a touch-feedback drawable and tint.

Bug: 14471388
Change-Id: If9c17a19acbec6628ad0d05efaf6492ac6fe96b9
parent 7adb8833

res-common/drawable/dialpad_key_colors.xml→res-common/drawable/btn_dialpad_key.xml

+2 −6
Original line number Diff line number Diff line
@@ -14,9 +14,5 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_pressed="true"

        android:drawable="@color/background_dialpad_pressed" />

    <item android:drawable="@color/background_dialpad" />

</selector>
 
<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="@color/dialpad_touch_tint" android:pinned="true"/>
 
 No newline at end of file

res-common/layout/dialpad_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 


        <ImageButton

            android:id="@+id/deleteButton"

            android:background="@drawable/btn_dialpad_key"

            android:paddingLeft="@dimen/dialpad_digits_padding"

            android:paddingRight="@dimen/dialpad_digits_padding"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:state_enabled="false"

            android:background="@drawable/dialpad_key_colors"

            android:contentDescription="@string/description_delete_button"

            android:src="@drawable/ic_dial_action_delete" />

    </LinearLayout>

res-common/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -88,4 +88,6 @@ 
    <color name="dialpad_secondary_text_color">#66000000</color>

    <color name="dialpad_digits_text_color">#000000</color>

    <color name="dialpad_separator_line_color">#dadada</color>

    <!-- 35% opacity, black. -->

    <color name="dialpad_touch_tint">#59000000</color>

</resources>

res-common/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar 
        <item name="android:layout_width">0dp</item>

        <item name="android:layout_height">@dimen/dialpad_key_height</item>

        <item name="android:layout_weight">13</item>

        <item name="android:background">@drawable/dialpad_key_colors</item>

        <item name="android:background">@drawable/btn_dialpad_key</item>

        <item name="android:focusable">true</item>

    </style>