Clean up key/identity verification Activites.

1) Get ride of the crazy button situation.
2) Actionbar-ify and abstract out the common actions.
3) Switch to full activities from dialog themes.
This commit is contained in:
Moxie Marlinspike
2012-07-23 13:42:29 -07:00
parent 8e3b08ebda
commit 78998d0c93
16 changed files with 432 additions and 514 deletions

View File

@@ -1,50 +1,49 @@
<?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
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TableLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:shrinkColumns="1">
<TableRow>
<TextView
android:textSize="12sp"
android:textSize="12sp"
android:text="Your identity:"
android:padding="3dip" />
<TextView
android:textSize="20sp"
android:typeface="monospace"
android:id="@+id/identity_fingerprint"
android:textSize="20sp"
android:typeface="monospace"
android:id="@+id/identity_fingerprint"
android:text=""
android:padding="3dip" />
</TableRow>
<TableRow>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_span="2">
<Button android:id="@+id/ok_button"
android:layout_margin="10dip"
android:padding="5dip"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="Ok"/>
<Button android:id="@+id/compare_button"
android:layout_margin="10dip"
android:padding="5dip"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="Compare" />
</LinearLayout>
</TableRow>
<TableRow>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_span="2">
<Button android:id="@+id/compare_button"
android:layout_margin="10dip"
android:padding="5dip"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="Compare" />
<Button android:id="@+id/ok_button"
android:layout_margin="10dip"
android:padding="5dip"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="Ok"/>
</LinearLayout>
</TableRow>
</TableLayout>
</ScrollView>