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

* commit 'fd2daf6a716006ba0b0243c523e440999610076a':
  fix npe when launching datetime settings for phone setup wizard
This commit is contained in:
Freeman Ng
2011-11-17 05:45:36 -08:00
committed by Android Git Automerger

View File

@@ -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,16 +32,13 @@
<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"
/>