diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-08 15:00:42 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-04-08 15:01:31 -0700 |
| commit | 63310252e8ab53ac9dd705ac86a91d2dde8d7fbf (patch) | |
| tree | d45b8adc1cb26355f6b62b12df9bbae3ce8538b1 | |
| parent | e96c83ad0a8f52a060d0ba7eac2290eb95b3b1c5 (diff) | |
Standardize fragment layout names
Change-Id: I76814eb5b90130227eea8e2f8576c472b80d1435
| -rw-r--r-- | InCallUI/res/layout-land/call_card_fragment.xml (renamed from InCallUI/res/layout-land/call_card_content.xml) | 0 | ||||
| -rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml (renamed from InCallUI/res/layout/call_card_content.xml) | 0 | ||||
| -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/CallCardFragment.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 2 |
5 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_fragment.xml index 0bb45a244..0bb45a244 100644 --- a/InCallUI/res/layout-land/call_card_content.xml +++ b/InCallUI/res/layout-land/call_card_fragment.xml diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_fragment.xml index a5fd8f72a..a5fd8f72a 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_fragment.xml diff --git a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml b/InCallUI/res/layout/incall_dialpad_fragment.xml index efd698286..efd698286 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/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 805ff0c6b..13accf5fb 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -164,7 +164,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mTranslationOffset = getResources().getDimensionPixelSize(R.dimen.call_card_anim_translate_y_offset); - return inflater.inflate(R.layout.call_card_content, container, false); + return inflater.inflate(R.layout.call_card_fragment, container, false); } @Override diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java index da3f0cb74..cdf331263 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -453,7 +453,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); + 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); |