X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FAboutActivity.java;h=f8e8eb36fbd6a5072e41ef9a5a8a9e99c7dfc240;hb=bc6574b86391ed9c731835c18de7bd0a10de19f8;hp=95b5fb338829816c762528fe72c99f8bcb4382ba;hpb=a44d1cbf2fdd6e460d88adcae1b84bff1802813f;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java index 95b5fb33..f8e8eb36 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java @@ -36,8 +36,8 @@ public class AboutActivity extends AppCompatActivity { setContentView(R.layout.about_coordinatorlayout); // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. - Toolbar supportAppBar = (Toolbar) findViewById(R.id.about_toolbar); - setSupportActionBar(supportAppBar); + Toolbar aboutAppBar = (Toolbar) findViewById(R.id.about_toolbar); + setSupportActionBar(aboutAppBar); // Display the home arrow on supportAppBar. final ActionBar appBar = getSupportActionBar(); @@ -46,17 +46,15 @@ public class AboutActivity extends AppCompatActivity { // Setup the ViewPager. ViewPager aboutViewPager = (ViewPager) findViewById(R.id.about_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 aboutPagerAdapter(getSupportFragmentManager())); // Setup the TabLayout and connect it to the ViewPager. TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.about_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); } public class aboutPagerAdapter extends FragmentPagerAdapter { - public aboutPagerAdapter(FragmentManager fm) { + private aboutPagerAdapter(FragmentManager fm) { super(fm); } @@ -83,7 +81,7 @@ public class AboutActivity extends AppCompatActivity { return getString(R.string.changelog); case 4: - return getString(R.string.license); + return getString(R.string.licenses); case 5: return getString(R.string.contributors);