diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-16 15:20:15 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-16 15:20:15 +0200 |
commit | 21e9d0b7b4b0375c43287d4acd66ee01f2f1d5a0 (patch) | |
tree | 7267a609535686e8a51e7f847b0e230f552b25aa /OpenKeychain/src/main/res/layout | |
parent | 81344389e548bbede12f9ad72824ce10cd718ea2 (diff) | |
parent | da28c000adf57baab1c282cc6efd3f1d8eb9e392 (diff) | |
download | open-keychain-21e9d0b7b4b0375c43287d4acd66ee01f2f1d5a0.tar.gz open-keychain-21e9d0b7b4b0375c43287d4acd66ee01f2f1d5a0.tar.bz2 open-keychain-21e9d0b7b4b0375c43287d4acd66ee01f2f1d5a0.zip |
Merge pull request #656 from danielhass/supertoast-dev
Added SuperToasts with new notify-wrapper
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_content.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/notification_area.xml | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index a496d8b9d..866857143 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -6,6 +6,8 @@ android:layout_height="match_parent" android:orientation="vertical"> + <include layout="@layout/notification_area"/> + <android.support.v4.view.ViewPager android:id="@+id/decrypt_pager" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/notification_area.xml b/OpenKeychain/src/main/res/layout/notification_area.xml new file mode 100644 index 000000000..d1ba265a5 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/notification_area.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> + +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:id="@+id/card_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/emphasis" + android:orientation="vertical" /> + +</merge>
\ No newline at end of file |