commit 66d9ca7fd09a9ea5705675efce055b7ab74dc5f5
author Nancy Chen <nancychen@google.com> Mon Dec 14 09:34:18 2015 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 14 09:34:18 2015 -0800
tree 59b96de3afa2f3504461a3813e48bf4b78d467c0
parent 9f071d5eca0c77c4c52ae88d5bca283111049d0a
parent b373f1960f484e2cf83587260e0df66120377d3c

Use FrameLayout to properly include dialpad theme.
am: b373f1960f

* commit 'b373f1960f484e2cf83587260e0df66120377d3c':
  Use FrameLayout to properly include dialpad theme.

res/layout/dialpad_view.xml

diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml
index 416ae93..c6cb5f5 100644
--- a/res/layout/dialpad_view.xml
+++ b/res/layout/dialpad_view.xml
@@ -15,8 +15,9 @@
   ~ limitations under the License
   -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include
-            layout="@layout/dialpad_view_unthemed"
-            android:theme="@style/Dialpad_Light" />
-</merge>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:theme="@style/Dialpad_Light">
+    <include layout="@layout/dialpad_view_unthemed" />
+</FrameLayout>