diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
commit | d8ff737fc5392362707ad70fbe964ac9e299457f (patch) | |
tree | 7af64313395f2d13f2e7129a573d4ef7333fadef /OpenKeychain/src/main/res/layout/key_server_preference.xml | |
parent | 862d1f1971a16d639dec47bd60226a959efe76b0 (diff) | |
download | open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.gz open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.bz2 open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.zip |
Use Toolbar and new BaseActivity
Diffstat (limited to 'OpenKeychain/src/main/res/layout/key_server_preference.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_server_preference.xml | 142 |
1 files changed, 77 insertions, 65 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index 33866f746..259763e48 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -1,82 +1,94 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> <LinearLayout - android:id="@+id/text_layout" + android:layout_below="@id/toolbar" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" > + android:layout_height="fill_parent" + android:orientation="vertical"> <LinearLayout - android:layout_width="0dip" + android:id="@+id/text_layout" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="6sp" - android:layout_marginLeft="16sp" - android:layout_marginRight="6sp" - android:layout_marginTop="6sp" - android:layout_weight="1" - android:background="@android:drawable/menuitem_background" - android:orientation="vertical" - android:focusable="true" > + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal"> - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="0dip" android:layout_height="wrap_content" - android:focusable="true" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceLarge" /> + android:layout_marginBottom="6sp" + android:layout_marginLeft="16sp" + android:layout_marginRight="6sp" + android:layout_marginTop="6sp" + android:layout_weight="1" + android:background="@android:drawable/menuitem_background" + android:orientation="vertical" + android:focusable="true"> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:focusable="true" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:id="@+id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> - <TextView - android:id="@+id/summary" + <Button + android:id="@+id/rotate" + android:layout_width="wrap_content" + android:layout_height="31dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4dip" + android:layout_marginRight="6dip" + android:text="rotate" + android:textColor="#ffffffff" + android:textStyle="bold" + android:background="@drawable/button_rounded_blue" /> + + <ImageButton + android:id="@+id/add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_gravity="center_vertical" + android:layout_margin="10dp" + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green" /> </LinearLayout> - <Button - android:id="@+id/rotate" - android:layout_width="wrap_content" - android:layout_height="31dp" - android:layout_gravity="center_vertical" - android:layout_marginLeft="4dip" - android:layout_marginRight="6dip" - android:text="rotate" - android:textColor="#ffffffff" - android:textStyle="bold" - android:background="@drawable/button_rounded_blue" - /> - <ImageButton - android:id="@+id/add" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="10dp" - android:src="@drawable/plus" - android:background="@drawable/button_rounded_green"/> - </LinearLayout> - <View - android:id="@+id/separator" - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:orientation="vertical" > + <View + android:id="@+id/separator" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> - <LinearLayout - android:id="@+id/editors" + <ScrollView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - </ScrollView> + android:layout_height="0dip" + android:layout_weight="1" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/editors" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + </ScrollView> + + </LinearLayout> -</LinearLayout> +</RelativeLayout>
\ No newline at end of file |