diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
| commit | 377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6 (patch) | |
| tree | c90c5941126937485b31f617dd1c31acd23fabae /OpenKeychain/src/main/res/layout/edit_key_activity.xml | |
| parent | da131220aac727865b9e33e8d34743939e8acbf0 (diff) | |
| parent | f4ee71e3ef0dcacf691def97a94880b277a99496 (diff) | |
| download | open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.gz open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.bz2 open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.zip | |
Merge branch 'ditch-appmsg'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/edit_key_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/edit_key_activity.xml | 53 |
1 files changed, 11 insertions, 42 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index b6c5a1c9a..7e71ccf53 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -1,46 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" - android:orientation="vertical" > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" > + <include layout="@layout/notify_area"/> - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:text="@string/label_passphrase" /> + <FrameLayout + android:id="@+id/edit_key_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> - <CheckBox - android:id="@+id/edit_key_no_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_no_passphrase" /> - - <Button - android:id="@+id/edit_key_btn_change_passphrase" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/btn_set_passphrase" - android:drawableLeft="@drawable/ic_action_edit" - android:background="@drawable/button_edgy" /> - - <LinearLayout - android:id="@+id/edit_key_container" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </LinearLayout> - -</ScrollView>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file |