diff options
author | Ashley Hughes <spirit.returned@gmail.com> | 2014-02-01 17:29:23 +0000 |
---|---|---|
committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-02-01 17:29:23 +0000 |
commit | 1e565ef8724453e2ab3c5f661b270f7ead78cce3 (patch) | |
tree | 0af54d9b871ddb2053053110600518c9678f32ed /OpenPGP-Keychain/src/main/res | |
parent | 65d328be14d5b77dc4b787960ae7eb398417acea (diff) | |
parent | abbdfd48dfef1a2cea5ac065bdbb4199e2b3b7de (diff) | |
download | open-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.tar.gz open-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.tar.bz2 open-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.zip |
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
3 files changed, 59 insertions, 61 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml index 126bcd8a6..0a49571d1 100644 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml @@ -3,29 +3,16 @@ xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <EditText - android:id="@+id/import_keys_file_input" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="top|left" - android:inputType="textMultiLine|textUri" - android:lines="2" - android:maxLines="6" - android:minLines="2" - android:scrollbars="vertical" /> + android:orientation="vertical"> <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_keys_file_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="4dp" + android:layout_width="match_parent" + android:layout_height="70dp" + android:layout_margin="10dp" + android:text="@string/filemanager_title_open" android:contentDescription="@string/filemanager_title_open" bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" bootstrapbutton:bb_size="default" bootstrapbutton:bb_type="default" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml deleted file mode 100644 index e866e05dc..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml +++ /dev/null @@ -1,43 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/import_keyserver_button" - android:layout_width="match_parent" - android:layout_height="70dp" - android:layout_margin="10dp" - android:text="@string/menu_key_server" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> - - <!-- <Spinner --> - <!-- android:id="@+id/import_keys_server_key_server" --> - <!-- android:layout_width="fill_parent" --> - <!-- android:layout_height="wrap_content" /> --> - - - <!-- <LinearLayout --> - <!-- android:layout_width="fill_parent" --> - <!-- android:layout_height="wrap_content" --> - <!-- android:orientation="horizontal" > --> - - - <!-- <EditText --> - <!-- android:id="@+id/import_keys_server_query" --> - <!-- android:layout_width="0dip" --> - <!-- android:layout_height="wrap_content" --> - <!-- android:layout_weight="1" --> - <!-- android:inputType="textPersonName|textEmailAddress" /> --> - - - <!-- <Button --> - <!-- android:id="@+id/import_keys_server_search" --> - <!-- android:layout_width="wrap_content" --> - <!-- android:layout_height="wrap_content" --> - <!-- android:text="@string/btn_search" /> --> - <!-- </LinearLayout> --> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml new file mode 100644 index 000000000..d5fa3e290 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml @@ -0,0 +1,54 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp" + android:orientation="vertical"> + + <Spinner + android:id="@+id/import_server_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <EditText + android:id="@+id/import_server_query" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="top|left" + android:hint="@string/hint_public_keys" + android:imeOptions="actionSearch" + android:inputType="textNoSuggestions" + android:singleLine="true" + android:lines="1" + android:maxLines="1" + android:minLines="1" + android:layout_gravity="center_vertical" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_server_search" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="10dp" + bootstrapbutton:bb_icon_left="fa-search" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + </LinearLayout> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_server_button" + android:layout_width="match_parent" + android:layout_height="70dp" + android:layout_margin="10dp" + android:text="@string/menu_key_server" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + +</LinearLayout>
\ No newline at end of file |