diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
| commit | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch) | |
| tree | 861f5c7d329ea8c96e673b2c16f068d593a55fb9 /OpenKeychain/src/main/res/layout/encrypt_text_activity.xml | |
| parent | 98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff) | |
| parent | 8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff) | |
| download | open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2 open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/encrypt_text_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_text_activity.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml index fd7fd6672..67f17fa81 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml @@ -15,7 +15,7 @@ android:layout_below="@id/toolbar_include" android:id="@+id/content_frame" android:fitsSystemWindows="true" - android:layout_marginTop="-25dp" + android:layout_marginTop="@dimen/minus_statusbar_height" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> |