Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd2daf6a authored by Freeman Ng's avatar Freeman Ng Committed by Android (Google) Code Review
Browse files

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

parents 0d59935d fd2945f3
Loading
Loading
Loading
Loading
+8 −10
Original line number Diff line number Diff line
@@ -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"
        />