diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-27 00:46:38 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-27 00:46:38 +0200 |
commit | a8782272b3db20ba6e88acab1d035d4699aa7166 (patch) | |
tree | 83606a4da7a6ad1bce7b456f449b3aad578919e3 /OpenKeychain/src/main/res/layout | |
parent | 8132b9ac745f6eedd4a7746f1e67358a61e9e4a7 (diff) | |
download | open-keychain-a8782272b3db20ba6e88acab1d035d4699aa7166.tar.gz open-keychain-a8782272b3db20ba6e88acab1d035d4699aa7166.tar.bz2 open-keychain-a8782272b3db20ba6e88acab1d035d4699aa7166.zip |
some more work on supertoast and result parcel stuff
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
5 files changed, 21 insertions, 67 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 diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml b/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml deleted file mode 100644 index f96b993c5..000000000 --- a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/edit_key_fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index 156351887..6c9bed872 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -2,16 +2,19 @@ <android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <LinearLayout - android:id="@+id/card_container" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + android:layout_height="match_parent"> - <include layout="@layout/key_list_content"/> + <include layout="@layout/notify_area"/> - <include layout="@layout/drawer_list" /> + <include layout="@layout/key_list_content"/> + + <include layout="@layout/drawer_list" /> + + </LinearLayout> </android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/notify_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml index d1ba265a5..d2188b2a1 100644 --- a/OpenKeychain/src/main/res/layout/notify_area.xml +++ b/OpenKeychain/src/main/res/layout/notify_area.xml @@ -6,7 +6,6 @@ android:id="@+id/card_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/emphasis" android:orientation="vertical" /> </merge>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 481b1ddf5..3aaa96cda 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <LinearLayout - android:id="@+id/card_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + <include layout="@layout/notify_area"/> <TextView android:layout_width="match_parent" |