aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorThialfihar <thi@thialfihar.org>2015-06-26 13:57:40 +0200
committerThialfihar <thi@thialfihar.org>2015-07-21 20:56:41 +0200
commit1c3fbe9bbe28a9c55697fc34608c781cc095c984 (patch)
tree2adc28bf1344fc93ba8b79994a1434b3c1121f8f /OpenKeychain/src/main/res/layout
parent7fab9511753f2e9f330448ade4e27e1653215a39 (diff)
downloadopen-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.tar.gz
open-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.tar.bz2
open-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.zip
Make bright toolbar themeable
Also remove a superfluous divider in the decrypt files fragment and the unused drawer_custom_header.xml. This changes the color of the toolbar in the light theme as well, because its brightness didn't play well with the system status bar of Android, drowning it in whiteness. Now it is still very light, but the system bar is still faintly visible above it.
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/drawer_custom_header.xml16
-rw-r--r--OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml2
3 files changed, 2 insertions, 18 deletions
diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
deleted file mode 100644
index 716ec2cd2..000000000
--- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:background="?attr/colorPrimary">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/app_name"
- android:textColor="@color/white"
- android:layout_gravity="center_horizontal" />
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml
index 4f9b5d373..1afa76b60 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar_include"
android:elevation="4dp"
- android:background="@color/white"
+ android:background="?attr/colorBrightToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml
index d4269c2ba..8fddfe4ba 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml
@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar_include"
android:elevation="4dp"
- android:background="@color/white"
+ android:background="?attr/colorBrightToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">