X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FGuideActivity.java;h=a419ff91030790058ecc121426d91e40bb0fd298;hb=1ec4db87420eb1b562b1869dca167277d5c02b42;hp=3bde5a16dfa722951a9e2ffc719f05b3bae32af4;hpb=74857298f431569df1849e8ef91387cb25274095;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java index 3bde5a16..a419ff91 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -49,7 +49,7 @@ public class GuideActivity extends AppCompatActivity { setContentView(R.layout.guide_coordinatorlayout); // We need to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar); + Toolbar guideAppBar = findViewById(R.id.guide_toolbar); setSupportActionBar(guideAppBar); // Display the home arrow on `ppBar`. @@ -58,12 +58,12 @@ public class GuideActivity extends AppCompatActivity { appBar.setDisplayHomeAsUpEnabled(true); // Setup the ViewPager. - ViewPager aboutViewPager = (ViewPager) findViewById(R.id.guide_viewpager); + ViewPager aboutViewPager = findViewById(R.id.guide_viewpager); assert aboutViewPager != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutViewPager might be null. aboutViewPager.setAdapter(new guidePagerAdapter(getSupportFragmentManager())); // Setup the TabLayout and connect it to the ViewPager. - TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.guide_tablayout); + TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout); assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null. aboutTabLayout.setupWithViewPager(aboutViewPager); } @@ -76,7 +76,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 7; + return 8; } @Override @@ -99,9 +99,12 @@ public class GuideActivity extends AppCompatActivity { return getString(R.string.domain_settings); case 5: - return getString(R.string.tor); + return getString(R.string.ssl_certificates); case 6: + return getString(R.string.tor); + + case 7: return getString(R.string.tracking_ids); default: