From 74144aeef902e919cf789e89c0dc49be3fb1bd2f Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 13 Apr 2015 15:07:16 -0700
Subject: Rename dialpad fragment layout file

Avoid potential merge conflict from m-wireless-dev

Change-Id: I512f0063bcee72070ae8977b90d2701ecc36deb0
---
 InCallUI/src/com/android/incallui/DialpadFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'InCallUI/src/com/android/incallui/DialpadFragment.java')

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index 5a02b8b0e..90610a82d 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -422,7 +422,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View parent = inflater.inflate(
-                com.android.incallui.R.layout.dtmf_twelve_key_dialer_view, container, false);
+                com.android.incallui.R.layout.incall_dialpad_fragment, container, false);
         mDialpadView = (DialpadView) parent.findViewById(R.id.dialpad_view);
         mDialpadView.setCanDigitsBeEdited(false);
         mDialpadView.setBackgroundResource(R.color.incall_dialpad_background);
-- 
cgit v1.2.3