diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
| commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
| tree | 6375bd8a5436c866824190318d10d183d8548ab6 /OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml | |
| parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
| parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
| download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index 32843eb29..7bb861547 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -43,7 +42,7 @@ android:layout_height="wrap_content" tools:layout="@layout/select_secret_key_layout_fragment" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/api_account_settings_create_key" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -52,9 +51,9 @@ android:layout_marginRight="4dp" android:layout_marginTop="4dp" android:text="@string/api_settings_create_key" - bootstrapbutton:bb_icon_left="fa-key" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_accounts" + android:textSize="14dip"/> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" |