merge from open-source master

Change-Id: I5698914cf9093696ad851412a510a99419989d17
This commit is contained in:
The Android Open Source Project
2010-05-19 08:30:08 -07:00

View File

@@ -17,23 +17,27 @@
** limitations under the License.
*/
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/info_layout">
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/info_layout">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/master_clear_desc" />
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/master_clear_desc" />
</ScrollView>
<Button
android:id="@+id/initiate_master_clear"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dip"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:text="@string/master_clear_button_text"
android:gravity="center" />
<Button android:id="@+id/initiate_master_clear"
android:layout_gravity="center_horizontal"
android:layout_marginTop="40dip"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:text="@string/master_clear_button_text"
android:gravity="center" />
</LinearLayout>