Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1

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>