diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 11:40:37 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 11:40:37 +0100 |
| commit | 8e12e93bc03eeb3bbd41b561826391b626868b31 (patch) | |
| tree | 0fd74682f379a2036a7ed3e89de66ee7eb4faad4 /OpenKeychain/src/main/res/layout | |
| parent | 71db34ed75c740f898dff62ef775082c91812c00 (diff) | |
| parent | 0362dc6c1df7e33e9c25abb5b8aed293c67f1f84 (diff) | |
| download | open-keychain-8e12e93bc03eeb3bbd41b561826391b626868b31.tar.gz open-keychain-8e12e93bc03eeb3bbd41b561826391b626868b31.tar.bz2 open-keychain-8e12e93bc03eeb3bbd41b561826391b626868b31.zip | |
Merge pull request #1097 from ishan1604/orange-toolbar
Orange toolbar for certify and fingerprint activity added
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 33 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml index ec91d1455..764b2eac0 100644 --- a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml @@ -7,7 +7,7 @@ <include android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> + layout="@layout/toolbar_standalone_orange" /> <LinearLayout android:layout_below="@id/toolbar_include" diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index fab8bc2d2..56dca302f 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_include" - layout="@layout/toolbar_standalone" /> + layout="@layout/toolbar_standalone_orange" /> <LinearLayout android:layout_below="@id/toolbar_include" diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml new file mode 100644 index 000000000..352da739b --- /dev/null +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<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_include" + android:elevation="4dp" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <!-- + We always have windowTranslucentStatus=true to get under the status bar. + Thus this ImageView is the part under the status bar! + --> + <ImageView + android:id="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/statusbar_height" + android:background="@color/android_orange_dark" /> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_below="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:background="@color/android_orange_light" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" /> + +</RelativeLayout> |