diff options
| author | Daniel Albert <albert_daniel@t-online.de> | 2014-06-30 21:24:31 +0200 |
|---|---|---|
| committer | Daniel Albert <albert_daniel@t-online.de> | 2014-06-30 21:24:31 +0200 |
| commit | cc095a2098fce5477484e6c12a3dfd2d72505a99 (patch) | |
| tree | 25d00ad479a0ad58fb592a54311283439b791f7d /OpenKeychain | |
| parent | f3b68a99321da3369dd5c729c209915d7d7c8077 (diff) | |
| download | open-keychain-cc095a2098fce5477484e6c12a3dfd2d72505a99.tar.gz open-keychain-cc095a2098fce5477484e6c12a3dfd2d72505a99.tar.bz2 open-keychain-cc095a2098fce5477484e6c12a3dfd2d72505a99.zip | |
(should have) fixed Travis builds
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/edit_key_key_item.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/foldable_linearlayout.xml | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml index 2d2fe51ab..81fb643ab 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -80,13 +79,12 @@ android:paddingRight="10dip" android:text="@string/label_expiry" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/expiry" android:layout_width="match_parent" android:layout_height="40dp" android:text="@string/none" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" /> </TableRow> <TableRow diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index fa31d4a6c..3d2fb688b 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -27,8 +26,6 @@ android:layout_height="wrap_content" android:text="@string/none" android:layout_gravity="center_vertical" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" android:textColor="@color/emphasis"/> </LinearLayout> |