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

merged dialog

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-02-26 22:26:40 +05:30
parent ec353b0c39 1210a80a96
commit 99ff9d2340
835 changed files with 14491 additions and 5628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/res/menu/api_app_settings.xml
View File

@@ -12,4 +12,9 @@
android:title="@string/api_settings_revoke"
app:showAsAction="never" />
<item
android:id="@+id/menu_api_settings_advanced"
android:title="@string/api_settings_advanced"
app:showAsAction="never" />
</menu>

16
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -9,17 +9,6 @@
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="collapseActionView|always" />
<item
android:id="@+id/menu_key_list_search_cloud"
android:icon="@drawable/ic_cloud_search_24px"
android:title="@string/menu_search_cloud"
app:showAsAction="ifRoom|withText" />
<item
android:id="@+id/menu_key_list_add"
android:title="@string/import_qr_code_button"
app:showAsAction="ifRoom|withText" />
<item
android:id="@+id/menu_key_list_export"
android:title="@string/menu_export_all_keys"
@@ -30,11 +19,6 @@
android:title="@string/menu_create_key"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_import_existing_key"
android:title="@string/menu_import_existing_key"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_debug_cons"
android:title="Debug / Consolidate"

5
OpenKeychain/src/main/res/menu/key_list_multi.xml
View File

@@ -4,26 +4,23 @@
<item
android:id="@+id/menu_key_list_multi_encrypt"
android:icon="@drawable/ic_action_secure"
android:icon="@drawable/ic_lock_white_24dp"
android:title="@string/menu_encrypt_to" />
<item
android:id="@+id/menu_key_list_multi_export"
android:icon="@drawable/ic_action_import_export"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_list_multi_delete"
android:icon="@drawable/ic_action_discard"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_delete_key" />
<item
android:id="@+id/menu_key_list_multi_select_all"
android:icon="@drawable/ic_action_select_all"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_select_all" />

20
OpenKeychain/src/main/res/menu/key_view.xml
View File

@@ -2,9 +2,21 @@
<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_view_edit"
android:icon="@drawable/ic_mode_edit_white_24dp"
android:visible="false"
app:showAsAction="always"
android:title="@string/key_view_action_edit" />
<item
android:id="@+id/menu_key_view_refresh"
android:icon="@drawable/ic_refresh_white_24dp"
app:showAsAction="always"
android:title="@string/key_view_action_update" />
<item
android:id="@+id/menu_key_view_export_file"
android:icon="@drawable/ic_action_import_export"
app:showAsAction="never"
android:title="@string/menu_export_key" />
@@ -19,4 +31,10 @@
app:showAsAction="never"
android:title="@string/menu_advanced" />
<item
android:id="@+id/menu_key_view_certify_fingerprint"
app:showAsAction="never"
android:visible="false"
android:title="@string/menu_certify_fingerprint" />
</menu>

11
OpenKeychain/src/main/res/menu/key_view2.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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_view_refresh"
android:icon="@drawable/ic_refresh_white_24dp"
app:showAsAction="always"
android:title="@string/key_view_action_update" />
</menu>