Lint warning changes.

This commit is contained in:
Moxie Marlinspike
2012-09-09 16:10:46 -07:00
parent d102bd015e
commit 3d3db421d3
13 changed files with 346 additions and 311 deletions

View File

@@ -1,63 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TableLayout
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:stretchColumns="1">
android:layout_height="fill_parent" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:orientation="vertical" >
<TableRow>
<TextView
android:textSize="12sp"
android:padding="3dip"
android:text="@string/old_passphrase"
android:padding="3dip" />
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<EditText android:id="@+id/old_passphrase"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:password="true"/>
</TableRow>
<EditText
android:id="@+id/old_passphrase"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:layout_marginBottom="5dip" />
<TableRow>
<TextView
android:padding="3dip"
android:text="@string/new_passphrase"
android:textSize="12sp"
android:padding="3dip" />
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText android:id="@+id/new_passphrase"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:password="true"
/>
</TableRow>
<EditText
android:id="@+id/new_passphrase"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:layout_marginBottom="5dip" />
<TableRow>
<TextView
android:padding="3dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/repeat_new_passphrase"
android:textSize="12sp"
android:padding="3dip" />
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText android:id="@+id/repeat_passphrase"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:password="true"
/>
</TableRow>
<EditText
android:id="@+id/repeat_passphrase"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:layout_marginBottom="5dip" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip"
android:gravity="right"
android:orientation="horizontal" >
<TableRow>
<Button android:id="@+id/cancel_button"
android:padding="10dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"/>
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="*"
tools:ignore="UselessParent" >
<Button android:id="@+id/ok_button"
android:padding="10dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/ok"/>
</TableRow>
</TableLayout>
</ScrollView>
<TableRow>
<Button
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="15dip"
android:text="@string/cancel" />
<Button
android:id="@+id/ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dip"
android:text="@android:string/ok" />
</TableRow>
</TableLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>