diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:57:35 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:57:35 +0100 |
| commit | 9ef2795fcd04fc228b4e3f30342f9eb79bab59fc (patch) | |
| tree | 6d6705a2dc71bdb2ad7545e768f22460971190db /OpenKeychain/src/main/res/layout | |
| parent | 93c7eb72fbbf93938043566dfc1707b6714f325b (diff) | |
| parent | c7efaacc9d1abc03036625b29961b5dad2672c44 (diff) | |
| download | open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.tar.gz open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.tar.bz2 open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.zip | |
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_activity.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 2cba78f37..332b95ce5 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -50,18 +50,19 @@ android:layout_weight="1" android:background="@android:color/white" /> - <LinearLayout + <RelativeLayout android:id="@+id/import_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" android:background="@android:color/white"> <View + android:id="@+id/import_divider" android:layout_width="match_parent" android:layout_height="1dip" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:background="?android:attr/listDivider" /> <TextView @@ -70,7 +71,10 @@ android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_below="@id/import_divider" android:text="@string/import_import" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_file_download_grey_24dp" @@ -79,6 +83,12 @@ android:clickable="true" android:background="?android:selectableItemBackground" /> - </LinearLayout> + <RelativeLayout + android:id="@+id/import_snackbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/import_import" /> + + </RelativeLayout> </LinearLayout> </RelativeLayout>
\ No newline at end of file |