aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-03 16:05:18 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-03 16:05:18 +0100
commit7914aa5c08d25306be0def7873fe850514e89cb8 (patch)
treeafb1c23f604ebaf5779aa1c6d08ff057ad69b960 /OpenKeychain/src/main/res/layout
parente2a8819385dab5c925cbc25f728a6491fea185e9 (diff)
downloadopen-keychain-7914aa5c08d25306be0def7873fe850514e89cb8.tar.gz
open-keychain-7914aa5c08d25306be0def7873fe850514e89cb8.tar.bz2
open-keychain-7914aa5c08d25306be0def7873fe850514e89cb8.zip
Toolbar fixes, Toolbar under status bar on Lollipop
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/api_account_settings_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/api_app_settings_activity.xml15
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_create_account.xml7
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_error_message.xml9
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_register_app.xml7
-rw-r--r--OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml5
-rw-r--r--OpenKeychain/src/main/res/layout/certify_key_activity.xml5
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_activity.xml5
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_files_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_text_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_text_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/help_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_content.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/key_server_preference.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/log_display_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/nfc_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/qr_code_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/safe_slinger_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/select_public_key_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/toolbar_standalone.xml32
-rw-r--r--OpenKeychain/src/main/res/layout/upload_key_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/view_cert_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml4
28 files changed, 89 insertions, 74 deletions
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 b12bfb080..f88225a66 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
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 cdf450f6e..a59bca59b 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -30,11 +30,10 @@
<LinearLayout
android:layout_below="@+id/toolbar"
- android:paddingLeft="48dp"
- android:paddingBottom="8dp"
- android:paddingRight="72dp"
+ android:layout_marginLeft="48dp"
+ android:layout_marginRight="72dp"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content">
<ImageView
android:id="@+id/api_app_settings_app_icon"
@@ -84,9 +83,11 @@
android:orientation="vertical" />
<TextView
+ android:id="@+id/api_accounts_label"
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:text="@string/api_settings_accounts" />
<FrameLayout
@@ -95,6 +96,12 @@
android:layout_height="match_parent"
android:orientation="vertical" />
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/api_settings_advanced" />
+
<org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
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 f57ec9ad1..7863f3c7f 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
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 293443f62..0bcf40407 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
@@ -4,14 +4,13 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_below="@id/toolbar_include"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
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 903a92ea4..7cb3666bf 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<ScrollView
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="wrap_content">
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 fa0f73144..3d3d55f3c 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
@@ -4,12 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_below="@id/toolbar_include"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index d36e9e141..fab8bc2d2 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -4,12 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 1d51e3818..e8422fb37 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -4,12 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
- xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 10dd7b1f9..608fce111 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index 80b8b65fd..b97fc9c8e 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index a5c93ec77..c8b0e3afc 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index b8d2c2546..d292b1a5b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index d5f6f9ee8..66abd03b1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index dab3c4f05..6a78aa273 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -5,11 +5,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 637ea1e3f..93d630437 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index 5760d0906..bd0239da7 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -4,12 +4,12 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
android:orientation="vertical"
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index d3d1f6e88..5319a3ec0 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml
index 8aa618280..a243a9d2b 100644
--- a/OpenKeychain/src/main/res/layout/log_display_activity.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 64e239bc8..9acd0676c 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
index 0d608fde2..f17bc30bc 100644
--- a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -4,7 +4,7 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
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 fd495608c..11b502b34 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index 65d198eda..c2a5b2f53 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<ScrollView
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent">
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 e14acc17b..5a607e5ec 100644
--- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<RelativeLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true">
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index 5d83a2aa1..ff1f99e03 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -1,13 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/toolbar"
+ android:id="@+id/header"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?attr/actionBarSize"
- android:background="?attr/colorPrimaryDark"
- android:elevation="4dp"
- app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
- tools:ignore="UnusedAttribute" /> \ No newline at end of file
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/statusBar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/statusMargin"
+ android:background="?attr/colorPrimary" />
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_below="@+id/statusBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+ tools:ignore="UnusedAttribute" />
+
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 342052bdd..19e37783b 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index ddc42dd7e..0a6b46a93 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<ScrollView
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 7084627e8..cb6456082 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -5,11 +5,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
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 991d92ed3..c7f0f50d9 100644
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
@@ -4,11 +4,11 @@
android:layout_height="match_parent">
<include
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
- android:layout_below="@id/toolbar"
+ android:layout_below="@id/toolbar_include"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">