diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-14 00:48:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 00:48:22 +0000 |
| commit | 7fd5e5b73e2279d07eed498c46565e7bb170a3b0 (patch) | |
| tree | 813ca451c8fe09979eb2a4e54d4b8e6a5c3ccca4 | |
| parent | 750d76871d6e2ff64e7c53c09c688dd40777c5d3 (diff) | |
| parent | 74144aeef902e919cf789e89c0dc49be3fb1bd2f (diff) | |
Merge "Rename dialpad fragment layout file"
| -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); |