Merge "Adding missing touch feedback ripples for swap and hold conference...

<!--

  ~ 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

        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

        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 -->

        <item>#AD1457</item>

        <item>#B93221</item>

    </array>

    <!-- Ripple color used over light backgrounds. -->

    <color name="ripple_light">#40000000</color>

</resources>