Merge "Ripple tint is now color" into lmp-preview-dev
diff --git a/res-common/drawable/action_bar_tab.xml b/res-common/drawable/action_bar_tab.xml
index ecf463c..20b509e 100644
--- a/res-common/drawable/action_bar_tab.xml
+++ b/res-common/drawable/action_bar_tab.xml
@@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/tab_pressed_color">
<item>
- <ripple android:tint="@color/tab_pressed_color">
+ <ripple android:color="@color/tab_pressed_color">
<item android:drawable="@color/tab_default_color" />
</ripple>
</item>
diff --git a/res-common/drawable/btn_dialpad_key.xml b/res-common/drawable/btn_dialpad_key.xml
index a04d35a..a4cb088 100644
--- a/res-common/drawable/btn_dialpad_key.xml
+++ b/res-common/drawable/btn_dialpad_key.xml
@@ -15,5 +15,4 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorControlHighlight"
- android:pinned="true"/>
\ No newline at end of file
+ android:color="?android:attr/colorControlHighlight" />
\ No newline at end of file