X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FAboutActivity.java;h=6b462acda690882915e45c5df1556180d1a6d998;hb=c4ad9f457f41cbc86391e0099629cd94a235258a;hp=5b6da8cb1fd7c648843e7fc1dc3595eaf21e6e2a;hpb=44014ce1673cb4cbfcdaeceac59c067a5074b35c;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 5b6da8cb..6b462acd 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java @@ -36,22 +36,22 @@ 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(); - assert appBar != null;// This assert removes the incorrect warning on the following line that appBar might be null. + assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that appBar might be null. appBar.setDisplayHomeAsUpEnabled(true); // Setup the ViewPager. ViewPager aboutViewPager = (ViewPager) findViewById(R.id.about_viewpager); - assert aboutViewPager != null; // This assert removes the incorrect warning on the following line that aboutViewPager might be null. + 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 on the following line that aboutTabLayout might be null. + assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null. aboutTabLayout.setupWithViewPager(aboutViewPager); } @@ -83,7 +83,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); @@ -102,6 +102,4 @@ public class AboutActivity extends AppCompatActivity { return AboutTabFragment.createTab(tab); } } - - }