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

Merge branch 'unified-keylist'

Browse Source 
Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
This commit is contained in:
Vincent Breitmoser
2014-03-12 18:05:28 +01:00
parent a9e5619a14 be558944b5
commit 69f5bf6b57
27 changed files with 600 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenPGP-Keychain/src/main/res/menu/key_list_public.xml → OpenPGP-Keychain/src/main/res/menu/key_list.xml
View File

@@ -3,18 +3,18 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_list_public_import"
android:id="@+id/menu_key_list_import"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_add_person"
android:title="@string/menu_import" />
<item
android:id="@+id/menu_key_list_public_export"
android:id="@+id/menu_key_list_export"
app:showAsAction="never"
android:title="@string/menu_export_keys" />
<item
android:id="@+id/menu_key_list_public_search"
android:id="@+id/menu_key_list_search"
android:title="@string/menu_search"
android:icon="@drawable/ic_action_search"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="collapseActionView|ifRoom" />
</menu>
</menu>

10
OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml → OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
View File

@@ -2,20 +2,20 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_key_list_public_multi_select_all"
android:id="@+id/menu_key_list_multi_select_all"
android:icon="@drawable/ic_action_select_all"
android:title="@string/menu_select_all" />
<item
android:id="@+id/menu_key_list_public_multi_export"
android:id="@+id/menu_key_list_multi_export"
android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_list_public_multi_encrypt"
android:id="@+id/menu_key_list_multi_encrypt"
android:icon="@drawable/ic_action_secure"
android:title="@string/menu_encrypt_to" />
<item
android:id="@+id/menu_key_list_public_multi_delete"
android:id="@+id/menu_key_list_multi_delete"
android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key" />
</menu>
</menu>

22
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_list_secret_create"
app:showAsAction="always|withText"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_secret_create_expert"
app:showAsAction="never"
android:title="@string/menu_create_key_expert" />
<item
android:id="@+id/menu_key_list_secret_import"
app:showAsAction="never"
android:title="@string/menu_import" />
<item
android:id="@+id/menu_key_list_secret_export"
app:showAsAction="never"
android:title="@string/menu_export_keys" />
</menu>

17
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_key_list_public_multi_select_all"
android:icon="@drawable/ic_action_select_all"
android:title="@string/menu_select_all" />
<item
android:id="@+id/menu_key_list_public_multi_export"
android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_list_public_multi_delete"
android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key" />
</menu>