Merge "[LockScreenSetup] Move retry button to top" into mnc-dev

                android:minHeight="50dip"

                android:textSize="18sp"/>

            <Button android:id="@+id/retryButton"

                style="@android:style/Widget.Material.Button.Borderless.Colored"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:text="@string/lockpattern_retry_button_text"/>

            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="0dip"

        </LinearLayout>

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="horizontal">

            <Button android:id="@+id/retryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/lockpattern_retry_button_text"/>

        <TextView android:id="@+id/footerText"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:minHeight="50dip"

                android:textSize="14sp"/>

        </LinearLayout>

            android:textSize="14sp"

            android:visibility="gone"/>

        <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->

        <LinearLayout

    <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->

    <string name="lockpattern_restart_button_text">Redraw</string>

    <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->

    <string name="lockpattern_retry_button_text">Retry</string>

    <string name="lockpattern_retry_button_text">Clear</string>

    <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->

    <string name="lockpattern_continue_button_text">Continue</string>

    <!-- Security & location settings screen, unlock screen activity title -->