cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

Browse Source
This commit is contained in:
Tim Bray
2014-09-12 08:34:51 -07:00
parent 36ef8a9a62
commit 1c32d1df88
26 changed files with 500 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml → OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
View File

@@ -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>

32
OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
View File

@@ -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" />

25
OpenKeychain/src/main/res/layout/key_server_preference.xml
View File

@@ -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,28 @@
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/shuffle"
android:layout_width="wrap_content"
android:layout_height="31dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dip"
android:layout_marginRight="6dip"
android:text="shuffle"
android:textColor="#ffffffff"
android:textStyle="bold"
android:paddingTop="2dp"
android:paddingBottom="2dp"
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>