From b373f1960f484e2cf83587260e0df66120377d3c Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Wed, 9 Dec 2015 15:44:19 -0800
Subject: Use FrameLayout to properly include dialpad theme.

On Lollipop devices, adding the theme to the <include> tag causes a
crash. Use FrameLayout instead which is compatible with Lollipop and
Marshmallow.

Bug: 25776171
Change-Id: Iff0d40fddd064a2e4477f0aca9d667fd564368c0
---
 res/layout/dialpad_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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>
-- 
cgit v1.2.3