diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
| commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
| tree | 6375bd8a5436c866824190318d10d183d8548ab6 /OpenKeychain/src/main/res/layout/notify_area.xml | |
| parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
| parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
| download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/notify_area.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/notify_area.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/notify_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml new file mode 100644 index 000000000..d1ba265a5 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/notify_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 |