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

ImportKeys: Move action buttons inside action bar

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-20 16:48:55 +02:00
parent 9469d6d6b2
commit 37f91e326c
14 changed files with 114 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/res/menu/import_keys_cloud_fragment.xml
View File

@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/import_cloud_settings"
android:id="@+id/menu_import_keys_cloud_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="collapseActionView|always" />
<item
android:id="@+id/menu_import_keys_cloud_settings"
android:title="@string/menu_preferences" />
</menu>

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

@@ -0,0 +1,17 @@
<?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_import_keys_file_paste"
android:icon="@drawable/ic_content_paste_white_24dp"
android:title="@string/menu_paste"
app:showAsAction="always" />
<item
android:id="@+id/menu_import_keys_file_open"
android:icon="@drawable/ic_folder_white_24dp"
android:title="@string/menu_open"
app:showAsAction="always" />
</menu>