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

Commit e4bd6551 authored by Andrew Lee's avatar Andrew Lee Committed by Android Git Automerger
Browse files

am 76670b96: Merge "Add touch feedback to dialpad buttons."

* commit '76670b96aea90e8a3070c54194665925233e9277':
  Add touch feedback to dialpad buttons.
parents d398511c bb135a5c
Loading
Loading
Loading
Loading
+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
+1 −1
Original line number Diff line number Diff line
@@ -53,12 +53,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>
+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>
+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">match_parent</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>