From 625d82f740f0723b183dc3b3690d42159f553574 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Wed, 17 May 2017 08:17:09 -0700
Subject: [PATCH] Fix TimePicker crash on rotation.

We were using two different types of layouts in landscape and portrait.

I unintentionally changed it from RelativeLayout to LinearLayout originally,
without even removing relative layout params.

Bug: 37650833
Test: Manual check that TimePicker no longer crashes on device rotation
Change-Id: If951e83c32377c0ed52d553ceb80683c4fba8b85
---
 core/res/res/layout-land/time_picker_material.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/res/res/layout-land/time_picker_material.xml b/core/res/res/layout-land/time_picker_material.xml
index 8b95f9f814aa1..863efef5c6619 100644
--- a/core/res/res/layout-land/time_picker_material.xml
+++ b/core/res/res/layout-land/time_picker_material.xml
@@ -20,11 +20,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/time_header"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:gravity="center"
         android:paddingStart="?attr/dialogPreferredPadding"
         android:paddingEnd="?attr/dialogPreferredPadding">
@@ -112,7 +111,7 @@
                 android:includeFontPadding="false"
                 android:button="@null" />
         </RadioGroup>
-    </LinearLayout>
+    </RelativeLayout>
 
     <TextView
         android:visibility="gone"