diff options
author | Nancy Chen <nancychen@google.com> | 2015-12-09 15:44:19 -0800 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2015-12-09 15:44:19 -0800 |
commit | b373f1960f484e2cf83587260e0df66120377d3c (patch) | |
tree | afe4ad04f8ffb3f19acb248640aa24544fccc9a7 /res/layout | |
parent | f76d293fa3cac9e7683084891ac29f0b95628ee0 (diff) | |
download | packages_apps_PhoneCommon-b373f1960f484e2cf83587260e0df66120377d3c.tar.gz packages_apps_PhoneCommon-b373f1960f484e2cf83587260e0df66120377d3c.tar.bz2 packages_apps_PhoneCommon-b373f1960f484e2cf83587260e0df66120377d3c.zip |
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
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dialpad_view.xml | 11 |
1 files 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> |