diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
7 files changed, 18 insertions, 11 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml index 04f41d38c..5fd36286b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_cancel" style="@style/Widget.AppCompat.ActionButton" android:layout_width="0dp" @@ -33,4 +33,4 @@ style="@style/Widget.AppCompat.Light.ActionBar.TabText" android:text="Cancel (set in-code!)" /> -</merge>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml index c39f6978e..e51f63c80 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_done" style="@style/Widget.AppCompat.ActionButton" android:layout_width="0dp" @@ -33,4 +33,4 @@ style="@style/Widget.AppCompat.Light.ActionBar.TabText" android:text="Done (set in-code!)" /> -</merge>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index 22e8192f2..c56ba130e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -5,11 +5,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:orientation="vertical"> + + <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:fillViewport="true" - android:orientation="vertical"> + android:fillViewport="true"> <LinearLayout android:layout_width="match_parent" @@ -68,6 +73,7 @@ android:layout_gravity="left" android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignTop="@+id/linearLayout" android:layout_toRightOf="@+id/relativeLayout" /> <TextView @@ -200,6 +206,7 @@ </LinearLayout> </LinearLayout> </ScrollView> + </LinearLayout> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml index 6454b3333..18210afc5 100644 --- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml +++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml @@ -12,6 +12,7 @@ android:layout_width="240dp" android:layout_height="match_parent" android:layout_gravity="start" + android:background="#fff" android:choiceMode="singleChoice" android:divider="@color/bg_gray" android:dividerHeight="1dp" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml index 437e5ebaf..663949d8e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml @@ -71,8 +71,7 @@ android:id="@+id/comment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="text"/> + android:layout_weight="1" /> </TableRow> </TableLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml index 950978a0e..058a43eaf 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml @@ -13,7 +13,7 @@ <EditText android:id="@+id/server" - android:layout_width="0dip" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textUri" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml index eddbe3cbf..4a09e4240 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml @@ -14,7 +14,7 @@ android:orientation="horizontal" > <RelativeLayout - android:layout_width="0dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="6sp" android:layout_marginLeft="16sp" |