diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-22 11:22:13 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-22 11:22:13 +0100 |
| commit | d87fd019909fcbb8489a70f55d307096e0700e1c (patch) | |
| tree | 60003fcc5040d5c183cb7744a36901c8afcfb8c8 /OpenKeychain/src/main/res/layout-mdpi | |
| parent | ae9a96bfad81ea05cdbc955bb96202335df075f0 (diff) | |
| parent | c9487b90f15f367ae4adc2218434c09b1e1f653f (diff) | |
| download | open-keychain-d87fd019909fcbb8489a70f55d307096e0700e1c.tar.gz open-keychain-d87fd019909fcbb8489a70f55d307096e0700e1c.tar.bz2 open-keychain-d87fd019909fcbb8489a70f55d307096e0700e1c.zip | |
Merge branch 'TedaLIEz-master'
Diffstat (limited to 'OpenKeychain/src/main/res/layout-mdpi')
| -rw-r--r-- | OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml index 2e2159f4e..502050849 100644 --- a/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml @@ -339,5 +339,22 @@ </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:id="@+id/faq_animator" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <android.support.v4.widget.Space + android:layout_width="wrap_content" + android:layout_height="match_parent" /> + <TextView + android:id="@+id/tv_faq" + android:text="@string/how_to_import" + android:gravity="center" + style="?android:buttonBarButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </LinearLayout> |