merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
This commit is contained in:
@@ -17,23 +17,27 @@
|
|||||||
** limitations under the License.
|
** limitations under the License.
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
style="@style/info_layout">
|
style="@style/info_layout">
|
||||||
|
|
||||||
<TextView
|
<ScrollView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="0dip"
|
||||||
android:textSize="18sp"
|
android:layout_weight="1">
|
||||||
android:text="@string/master_clear_desc" />
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
<Button android:id="@+id/initiate_master_clear"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:textSize="18sp"
|
||||||
android:layout_marginTop="40dip"
|
android:text="@string/master_clear_desc" />
|
||||||
android:layout_width="150dip"
|
</ScrollView>
|
||||||
android:layout_height="wrap_content"
|
<Button
|
||||||
android:text="@string/master_clear_button_text"
|
android:id="@+id/initiate_master_clear"
|
||||||
android:gravity="center" />
|
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" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user