From fd2945f3b11e5dedf191c20a8ab582f75fd58296 Mon Sep 17 00:00:00 2001
From: Freeman Ng <tenorslowworm@google.com>
Date: Tue, 15 Nov 2011 15:59:45 -0800
Subject: [PATCH] fix npe when launching datetime settings for phone setup
 wizard

also slightly "modernized" the UI while I was in there by removing
the button bar and button icon

bug: 5517928
Change-Id: I502d56780d7c3bd474fc5120a0b306def3c04dd4
---
 res/layout/date_time_settings_setupwizard.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index 283a28ee73e..95402cb0eda 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/layout_root"
         android:layout_height="fill_parent"
         android:layout_width="fill_parent"
         android:orientation="vertical">
@@ -31,19 +32,16 @@
 
     <RelativeLayout android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:layout_width="fill_parent"
-                    android:background="@android:drawable/bottom_bar">
-        
+                    android:padding="10dip"
+                    android:layout_width="fill_parent">
+
         <Button android:id="@+id/next_button"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
             android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
             android:text="@string/next_label"
         />
-        
+
     </RelativeLayout>
-    
+
 </LinearLayout>