summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-09-17 19:10:16 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-09-17 19:10:16 +0000
commitdee000b14f37126485e1f63a7b0e0cdda755a968 (patch)
treef4ecaa5488bb40eb3ed055f31100553a0fc9e367
parent36e6ee373e4cbe86cf349edb1b897f23ea8bc3f1 (diff)
parentcfb9e3e03446aa5050778e1821fa52c4354ce5c3 (diff)
downloadpackages_apps_InCallUI-dee000b14f37126485e1f63a7b0e0cdda755a968.tar.gz
packages_apps_InCallUI-dee000b14f37126485e1f63a7b0e0cdda755a968.tar.bz2
packages_apps_InCallUI-dee000b14f37126485e1f63a7b0e0cdda755a968.zip
Merge "MSIM: Fix fragment class names" into cm-11.0
-rw-r--r--res/layout-land/incall_screen_msim.xml2
-rw-r--r--res/layout/incall_screen_msim.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/layout-land/incall_screen_msim.xml b/res/layout-land/incall_screen_msim.xml
index cb70541c..45248185 100644
--- a/res/layout-land/incall_screen_msim.xml
+++ b/res/layout-land/incall_screen_msim.xml
@@ -51,7 +51,7 @@
</RelativeLayout>
- <fragment android:name="com.android.incallui.MsimAnswerFragment"
+ <fragment android:name="com.android.incallui.MSimAnswerFragment"
android:id="@+id/answerFragment"
android:layout_width="wrap_content"
android:layout_height="match_parent"
diff --git a/res/layout/incall_screen_msim.xml b/res/layout/incall_screen_msim.xml
index be164a40..b42bd347 100644
--- a/res/layout/incall_screen_msim.xml
+++ b/res/layout/incall_screen_msim.xml
@@ -56,7 +56,7 @@
</RelativeLayout>
- <fragment android:name="com.android.incallui.MsimAnswerFragment"
+ <fragment android:name="com.android.incallui.MSimAnswerFragment"
android:id="@+id/answerFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"