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

ImportKeys: Add menu in import fragments

Browse Source 
- Move cloud settings to menu
- TODO: Import all keys
This commit is contained in:
Andrea Torlaschi
2016-06-17 22:03:30 +02:00
parent a0f371af41
commit c41b658e8f
7 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
View File

@@ -5,50 +5,33 @@
<LinearLayout
android:layout_width="match_parent"
android:paddingLeft="8dp"
android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="8dp">
<AutoCompleteTextView
android:id="@+id/cloud_import_server_query"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:gravity="top|left"
android:hint="@string/hint_cloud_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" />
android:singleLine="true" />
<ImageButton
android:id="@+id/cloud_import_server_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_search_grey_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dip"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" />
<ImageButton
android:id="@+id/cloud_import_server_config_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?android:selectableItemBackground"
android:padding="8dp"
android:src="@drawable/ic_settings_grey_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
android:src="@drawable/ic_search_grey_24dp" />
</LinearLayout>

8
OpenKeychain/src/main/res/menu/import_keys_cloud_fragment.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/import_cloud_settings"
android:title="@string/menu_preferences" />
</menu>

8
OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/import_all_keys"
android:title="@string/menu_import_all_keys" />
</menu>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -133,6 +133,7 @@
<string name="menu_certify_fingerprint_phrases">"Confirm with phrases"</string>
<string name="menu_share_log">"Share log"</string>
<string name="menu_change_password">"Change password"</string>
<string name="menu_import_all_keys">"Import all keys"</string>
<string name="menu_keyserver_add">"Add"</string>