aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-03 14:28:54 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-03 14:28:54 +0100
commite2a8819385dab5c925cbc25f728a6491fea185e9 (patch)
tree775404eea45f6187a01d3fa0b0fb2ca5ece65b30 /OpenKeychain/src/main/res
parentc763ea35035be678bedacea13ec4c2b7c51f9943 (diff)
downloadopen-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.tar.gz
open-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.tar.bz2
open-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.zip
Floating Action Button added in app settings
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.pngbin0 -> 282 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.pngbin0 -> 257 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.pngbin0 -> 318 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.pngbin0 -> 399 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.pngbin0 -> 477 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable/drawer_header.pngbin47409 -> 47902 bytes
-rw-r--r--OpenKeychain/src/main/res/layout/api_account_settings_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/api_app_settings_activity.xml111
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_create_account.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_error_message.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_register_app.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/certify_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_files_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_text_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_text_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/help_activity.xml5
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_content.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/key_server_preference.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/log_display_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/nfc_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/qr_code_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/safe_slinger_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/select_public_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/toolbar_standalone.xml (renamed from OpenKeychain/src/main/res/layout/toolbar.xml)0
-rw-r--r--OpenKeychain/src/main/res/layout/upload_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_cert_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/menu/api_app_settings.xml5
-rw-r--r--OpenKeychain/src/main/res/values/colors.xml2
36 files changed, 132 insertions, 41 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..164385d04
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..8d1e433a5
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..a55d19922
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..043acd808
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..7cc008475
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index 614098bd7..373534722 100644
--- a/OpenKeychain/src/main/res/drawable/drawer_header.png
+++ b/OpenKeychain/src/main/res/drawable/drawer_header.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index 763504f54..b12bfb080 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index ac579d006..cdf450f6e 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -1,26 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:custom="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:fab="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <include
- android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ <RelativeLayout
+ android:id="@+id/toolbar_big"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:elevation="4dp"
+ android:background="?attr/colorPrimaryDark"
+ android:orientation="horizontal">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ android:background="?attr/colorPrimaryDark"
+ android:overScrollMode="always"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+ tools:ignore="UnusedAttribute"
+ android:transitionGroup="false"
+ android:touchscreenBlocksFocus="false" />
+
+ <LinearLayout
+ android:layout_below="@+id/toolbar"
+ android:paddingLeft="48dp"
+ android:paddingBottom="8dp"
+ android:paddingRight="72dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/api_app_settings_app_icon"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:src="@drawable/ic_launcher" />
+
+ <TextView
+ android:id="@+id/api_app_settings_app_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Name (set in-code)longlong"
+ android:textColor="@color/icons"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingLeft="8dp"
+ android:layout_gravity="center_vertical" />
+ </LinearLayout>
+ </RelativeLayout>
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:id="@+id/body"
+ android:layout_below="@id/toolbar_big"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment
- android:id="@+id/api_app_settings_fragment"
- android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:layout="@layout/api_app_settings_fragment" />
-
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -55,7 +95,56 @@
android:layout_height="match_parent"
android:orientation="vertical" />
+ <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textColor="@color/icons"
+ custom:foldedLabel="@string/api_settings_show_info"
+ custom:unFoldedLabel="@string/api_settings_hide_info">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/api_settings_package_name"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/api_app_settings_package_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="com.example"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/api_settings_package_signature"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/api_app_settings_package_signature"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Base64 encoded hash of signature"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
</LinearLayout>
</ScrollView>
</LinearLayout>
+
+ <com.getbase.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab"
+ android:layout_alignBottom="@id/toolbar_big"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="20dp"
+ android:layout_marginBottom="-40dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:elevation="4dp"
+ fab:fab_icon="@drawable/ic_play_arrow_white_24dp"
+ fab:fab_colorNormal="@color/fab"
+ fab:fab_colorPressed="@color/fab_pressed" />
+
</RelativeLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
index 7ae0a0e1e..f57ec9ad1 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
index 8483222ad..293443f62 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 300fde420..903a92ea4 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<ScrollView
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index db54e4a44..fa0f73144 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 3a4c343bb..d36e9e141 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 5225d4d77..1d51e3818 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 7cc2b35f3..10dd7b1f9 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index 5098d7ffa..80b8b65fd 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index dfc12f328..a5c93ec77 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 401b1c36e..b8d2c2546 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 0459fa3d7..d5f6f9ee8 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 7d3e1834c..dab3c4f05 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -6,13 +6,14 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:elevation="4dp">
<com.astuetz.PagerSlidingTabStrip
android:id="@+id/sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 78eaed02d..637ea1e3f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index 293c45e1c..5760d0906 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index 259763e48..d3d1f6e88 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml
index e5457043b..8aa618280 100644
--- a/OpenKeychain/src/main/res/layout/log_display_activity.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 5baaafc69..64e239bc8 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
index a328d15c6..0d608fde2 100644
--- a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -5,6 +5,6 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 79aba346f..fd495608c 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index c986325f1..65d198eda 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<ScrollView
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
index 86b0049c4..e14acc17b 100644
--- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<RelativeLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index 5d83a2aa1..5d83a2aa1 100644
--- a/OpenKeychain/src/main/res/layout/toolbar.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index f4d262f1d..342052bdd 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index b0f40238d..ddc42dd7e 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<ScrollView
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index a2d104694..7084627e8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -6,7 +6,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
index e77e01bc7..991d92ed3 100644
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml
index 1233e4f6e..4b4fc39e8 100644
--- a/OpenKeychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_app_settings.xml
@@ -3,9 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/menu_api_settings_start"
- android:title="@string/api_settings_start"
- android:icon="@drawable/ic_action_play"
+ android:id="@+id/menu_api_save"
+ android:title="@string/api_settings_save"
app:showAsAction="always" />
<item
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index fbbb89ed1..e4dbbc968 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -20,6 +20,8 @@
<color name="primary_dark">#388E3C</color>
<color name="primary_light">#C8E6C9</color>
<color name="accent">#00BCD4</color>
+ <color name="fab">#00BCD4</color>
+ <color name="fab_pressed">#0097A7</color>
<color name="primary_text">#212121</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>