diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-13 15:07:16 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-04-13 15:08:00 -0700 |
| commit | 74144aeef902e919cf789e89c0dc49be3fb1bd2f (patch) | |
| tree | 98c11c860a5932b2fa084eb61f933fa8784950ae | |
| parent | e7391d8b82b352b4968ac8b39523f04555ec4eff (diff) | |
Rename dialpad fragment layout file
Avoid potential merge conflict from m-wireless-dev
Change-Id: I512f0063bcee72070ae8977b90d2701ecc36deb0
| -rw-r--r-- | InCallUI/res/layout/incall_dialpad_fragment.xml (renamed from InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml) | 0 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml b/InCallUI/res/layout/incall_dialpad_fragment.xml index b567dbbf2..b567dbbf2 100644 --- a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml +++ b/InCallUI/res/layout/incall_dialpad_fragment.xml 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); |