cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multicertify: move key spinner to the bottom

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-06 15:41:15 +02:00
parent 4b6016fcfc
commit b16a550fbb
4 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/res/layout/add_keys_activity.xml
View File

@@ -29,9 +29,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:padding="0dp"
android:layout_margin="0dp">
<TextView <TextView
android:paddingLeft="8dp" android:paddingLeft="8dp"
@@ -136,5 +134,7 @@
android:layout_marginBottom="8dp" /> android:layout_marginBottom="8dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

11
OpenKeychain/src/main/res/layout/log_display_fragment.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/log_text" />
</LinearLayout>

60
OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
View File

@@ -16,35 +16,6 @@
android:paddingRight="16dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:text="@string/section_certification_key" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp">
<TextView
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/key_colon"
android:paddingRight="8dp" />
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
android:id="@+id/certify_key_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -79,16 +50,38 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@string/section_actions" android:text="@string/section_certify"
android:layout_weight="1" /> android:layout_weight="1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<TextView
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/add_keys_my_key"
android:paddingRight="8dp" />
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
android:id="@+id/certify_key_spinner"
android:minHeight="56dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/certify_key_certify_button" android:id="@+id/certify_key_certify_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_marginBottom="8dp"
style="@style/SelectableItem" style="@style/SelectableItem"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -111,6 +104,11 @@
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -47,6 +47,7 @@
<string name="section_general">"General"</string> <string name="section_general">"General"</string>
<string name="section_defaults">"Defaults"</string> <string name="section_defaults">"Defaults"</string>
<string name="section_advanced">"Advanced"</string> <string name="section_advanced">"Advanced"</string>
<string name="section_certify">"Certify"</string>
<string name="section_actions">"Actions"</string> <string name="section_actions">"Actions"</string>
<string name="section_share_key">"Whole key"</string> <string name="section_share_key">"Whole key"</string>
<string name="section_certification_key">"Your Key used for certification"</string> <string name="section_certification_key">"Your Key used for certification"</string>