diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-15 10:20:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-15 10:20:01 +0200 |
commit | 67e572cf4f65fa8e643825cd4ec75f03951a5dd7 (patch) | |
tree | 15e0b3cc73d8681036b82fab3b2599e79ce5cfb1 /OpenKeychain/src/main/res/layout | |
parent | 53bc417f8f77a9f92786457281d02431ef614ca7 (diff) | |
parent | ba7ef28ade4161ebecf8db7271114d96d9ae0595 (diff) | |
download | open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.gz open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.bz2 open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml (renamed from OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml) | 27 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml | 32 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_list_entry.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_server_preference.xml | 23 |
4 files changed, 21 insertions, 63 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml index 62e7d740c..46ec736ca 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml @@ -11,12 +11,12 @@ android:orientation="horizontal"> <AutoCompleteTextView - android:id="@+id/import_server_query" + android:id="@+id/cloud_import_server_query" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="top|left" - android:hint="@string/hint_keyserver_search_hint" + android:hint="@string/hint_cloud_search_hint" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" @@ -26,7 +26,7 @@ android:layout_gravity="center_vertical" /> <ImageButton - android:id="@+id/import_server_search" + android:id="@+id/cloud_import_server_search" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -43,7 +43,7 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/import_server_config_button" + android:id="@+id/cloud_import_server_config_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -53,24 +53,5 @@ </LinearLayout> - <LinearLayout - android:id="@+id/import_server_config" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <Spinner - android:id="@+id/import_server_spinner" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml deleted file mode 100644 index c70236e07..000000000 --- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/import_keybase_query" - android:layout_marginLeft="8dp" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="top|left" - android:hint="@string/hint_keybase_search_hint" - android:imeOptions="actionSearch" - android:inputType="textNoSuggestions" - android:singleLine="true" - android:lines="1" - android:maxLines="1" - android:minLines="1" - android:layout_gravity="center_vertical" /> - - <ImageButton - android:id="@+id/import_keybase_search" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_search" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml index 773250dc6..74de77172 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml @@ -30,6 +30,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingRight="8dp" + android:paddingTop="2dp" + android:gravity="top|center" android:clickable="false" android:focusable="false" android:focusableInTouchMode="false" /> diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index baf7111af..33866f746 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -12,7 +12,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" > - <RelativeLayout + <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" android:layout_marginBottom="6sp" @@ -21,6 +21,7 @@ android:layout_marginTop="6sp" android:layout_weight="1" android:background="@android:drawable/menuitem_background" + android:orientation="vertical" android:focusable="true" > <TextView @@ -35,20 +36,26 @@ android:id="@+id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignLeft="@android:id/title" - android:layout_below="@android:id/title" - android:maxLines="2" android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - + </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:layout_marginLeft="4dip" - android:layout_marginRight="6dip" android:src="@drawable/plus" android:background="@drawable/button_rounded_green"/> </LinearLayout> |