aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-30 03:11:54 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-30 14:41:15 +0200
commit43e661790dbdbb4088decffc8f866d8b53f9c99c (patch)
tree9758d6aba50190e59301fa3d829bfcf302b0fbf2 /OpenKeychain/src/main/res/layout
parent4025acd13a2f5c4482c35ab0e4f6b9dd6bf02f11 (diff)
downloadopen-keychain-43e661790dbdbb4088decffc8f866d8b53f9c99c.tar.gz
open-keychain-43e661790dbdbb4088decffc8f866d8b53f9c99c.tar.bz2
open-keychain-43e661790dbdbb4088decffc8f866d8b53f9c99c.zip
import: simplify ImportKeysActivity, don't display search bar for fixed input
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_activity.xml29
1 files changed, 20 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 28bb8a0b8..6602c4b8f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
<include
android:id="@+id/toolbar_include"
@@ -21,16 +22,26 @@
<include layout="@layout/notify_area" />
- <FrameLayout
- android:id="@+id/import_keys_top_container"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="64dp"
- android:orientation="vertical" />
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:id="@+id/import_keys_top_layout"
+ android:visibility="gone"
+ tools:visibility="visible">
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider" />
+ <FrameLayout
+ android:id="@+id/import_keys_top_container"
+ android:layout_width="match_parent"
+ android:layout_height="64dp"
+ android:orientation="vertical" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider" />
+
+ </LinearLayout>
<FrameLayout
android:id="@+id/import_keys_list_container"