diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-31 22:21:46 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-31 22:21:46 +0200 |
commit | 0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7 (patch) | |
tree | 30668f8f220ff6018aa4406b5beb3f5bf1976d77 /OpenKeychain/src/main/res/layout | |
parent | 1e4f0c6b000167ff5a596ed0b0763141f2a2527f (diff) | |
download | open-keychain-0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7.tar.gz open-keychain-0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7.tar.bz2 open-keychain-0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7.zip |
- add multi select for storage api (kitkat)
- UI fixes
- refactoring
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 25 insertions, 30 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index b5d7b98cd..74d723d69 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingRight="16dp" - android:paddingLeft="16dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="16dp" + android:paddingLeft="16dp"> <LinearLayout android:layout_width="match_parent" @@ -22,16 +23,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="From: "/> + android:text="@string/from"/> <Spinner android:id="@+id/sign" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_sign" - android:padding="0dp" - android:layout_margin="0dp" - /> + android:layout_gravity="center_vertical"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml index ec71b25e5..b2bdbf7b5 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager - android:id="@+id/encrypt_pager_mode" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> </org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager> diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index 156fce8f0..3110b059e 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -10,17 +10,11 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:orientation="vertical"> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp"/> - <ListView android:id="@+id/selected_files_list" android:dividerHeight="4dip" android:divider="@android:color/transparent" + android:layout_marginTop="8dp" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"/> @@ -30,6 +24,8 @@ android:layout_height="1dip" android:background="?android:attr/listDivider"/> + <!-- Note: The following construct should be a widget, we use it quiet often --> + <LinearLayout android:id="@+id/action_encrypt_share" android:paddingLeft="8dp" |