From cb39795cb8b91df33f304d8155f277f968036b5a Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Fri, 6 Apr 2018 16:33:57 -0700
Subject: Resolve resource conflicts.

Bug: 77710848
Test: None
PiperOrigin-RevId: 191957734
Change-Id: I0b2674298722a405f4f2e970e877671cff37e60f
---
 .../widget/res/drawable/ripple_material_light.xml  | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 java/com/android/dialer/widget/res/drawable/ripple_material_light.xml

(limited to 'java/com/android/dialer/widget/res/drawable/ripple_material_light.xml')

diff --git a/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
new file mode 100644
index 000000000..175624c8b
--- /dev/null
+++ b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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/dialer_ripple_material_light">
+  <item android:id="@android:id/mask">
+    <color android:color="@android:color/white"/>
+  </item>
+</ripple>
-- 
cgit v1.2.3