diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-12-02 13:27:54 -0800 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2014-12-02 13:27:54 -0800 |
| commit | 576937a0a0cb030baa0724ffa287dc0d36abf192 (patch) | |
| tree | ffec9a04a8dfc0fd55577828a5e6551a3db44e03 /res | |
| parent | a44049e1d1e39daa32cda9485d72fcb23f9498dd (diff) | |
| download | packages_apps_InCallUI-576937a0a0cb030baa0724ffa287dc0d36abf192.tar.gz packages_apps_InCallUI-576937a0a0cb030baa0724ffa287dc0d36abf192.tar.bz2 packages_apps_InCallUI-576937a0a0cb030baa0724ffa287dc0d36abf192.zip | |
Adding missing touch feedback ripples for swap and hold conference buttons.
Added new ripple drawable for the two buttons.
Bug: 18592386
Change-Id: I3c4145c1a400e3880bbe11dfe5eae94d2e17de9e
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/conference_ripple.xml | 25 | ||||
| -rw-r--r-- | res/layout/caller_in_conference.xml | 6 | ||||
| -rw-r--r-- | res/values/colors.xml | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/res/drawable/conference_ripple.xml b/res/drawable/conference_ripple.xml new file mode 100644 index 00000000..4e4a2130 --- /dev/null +++ b/res/drawable/conference_ripple.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_light"> + <!-- Constrain the ripple to a rectangular area --> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/background_dialer_white" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/res/layout/caller_in_conference.xml b/res/layout/caller_in_conference.xml index 0d15eb10..ac78096f 100644 --- a/res/layout/caller_in_conference.xml +++ b/res/layout/caller_in_conference.xml @@ -97,7 +97,8 @@ android:scaleType="center" android:contentDescription="@string/goPrivate" android:tint="@color/conference_call_manager_icon_color" - android:background="?android:attr/selectableItemBackgroundBorderless" /> + android:background="@drawable/conference_ripple" + android:clickable="true" /> <!-- "Disconnect" button which terminates the connection with this caller. --> <ImageButton @@ -109,6 +110,7 @@ android:scaleType="center" android:contentDescription="@string/onscreenEndCallText" android:tint="@color/conference_call_manager_icon_color" - android:background="?android:attr/selectableItemBackgroundBorderless" /> + android:background="@drawable/conference_ripple" + android:clickable="true" /> </LinearLayout> <!-- End of single list element --> diff --git a/res/values/colors.xml b/res/values/colors.xml index 0308c9b7..afc557bc 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -103,4 +103,7 @@ <item>#AD1457</item> <item>#B93221</item> </array> + + <!-- Ripple color used over light backgrounds. --> + <color name="ripple_light">#40000000</color> </resources> |