aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-15 21:29:01 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-15 21:29:01 +0200
commitfcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78 (patch)
tree1f9d239570a70bc7b2820c2b99ad71d9398432f3 /OpenKeychain/src/main/java
parent8440693c510da39870bfba241ed3cdbd37d6dad3 (diff)
parent0f5093c0b335dccc2f6431febc391d1fbf068944 (diff)
downloadopen-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.tar.gz
open-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.tar.bz2
open-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index 32f37a0a5..8e93dc4e8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
@@ -63,17 +63,22 @@ public class HelpActivity extends ActionBarActivity {
mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_faq)),
HelpHtmlFragment.class, faqBundle, (selectedTab == 1));
+ Bundle wotBundle = new Bundle();
+ wotBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_wot);
+ mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_wot)),
+ HelpHtmlFragment.class, wotBundle, (selectedTab == 2));
+
Bundle nfcBundle = new Bundle();
nfcBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_nfc_beam);
mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_nfc_beam)),
- HelpHtmlFragment.class, nfcBundle, (selectedTab == 2));
+ HelpHtmlFragment.class, nfcBundle, (selectedTab == 3));
Bundle changelogBundle = new Bundle();
changelogBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_changelog);
mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_changelog)),
- HelpHtmlFragment.class, changelogBundle, (selectedTab == 3));
+ HelpHtmlFragment.class, changelogBundle, (selectedTab == 4));
mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_about)),
- HelpAboutFragment.class, null, (selectedTab == 4));
+ HelpAboutFragment.class, null, (selectedTab == 5));
}
}