cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaLIEz-master

Browse Source
This commit is contained in:
Dominik Schürmann
2015-12-22 11:19:38 +01:00
parent ae9a96bfad 5aec8b409f
commit c9487b90f1
6 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml
View File

@@ -339,5 +339,23 @@
</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>

17
OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
View File

@@ -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>

18
OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml
View File

@@ -339,5 +339,23 @@
</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>

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -347,7 +347,7 @@
<string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string>
<string name="select_key_to_certify">"Please select a key to be used for confirmation!"</string>
<string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string>
<string name="how_to_import">"How to import this?"</string>
<!--
errors
no punctuation, all lowercase,