diff options
| author | aLIEzTed <JianGuo@aLIEzTeddeMacBook-Pro.local> | 2015-12-15 19:00:53 +0800 |
|---|---|---|
| committer | TedaLIEz <aliezted@gmail.com> | 2015-12-22 17:36:28 +0800 |
| commit | 5aec8b409f2638443094c644aec9b057c60ada76 (patch) | |
| tree | 9d9052b67d06c0fb4ad9fe50e6ea49ec99a958a8 /OpenKeychain/src/main/res | |
| parent | 2e8efbee853ad6f5addda29ea3df08f2bab5c4b6 (diff) | |
| download | open-keychain-5aec8b409f2638443094c644aec9b057c60ada76.tar.gz open-keychain-5aec8b409f2638443094c644aec9b057c60ada76.tar.bz2 open-keychain-5aec8b409f2638443094c644aec9b057c60ada76.zip | |
Issue #1595
link to faq
link to app
Issue #1595
Issue#1595
Revert commits
Sorry for overhead annotation
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 54 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml index 3157bbfd3..0c93f4e24 100644 --- a/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml @@ -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> 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> diff --git a/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml index e7d8cac34..fd1e16145 100644 --- a/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml @@ -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> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c9eba5db2..075d5377c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -345,7 +345,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, |