Partial additional action button icons implementation.

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / AboutActivity.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
index 1df1387288a01fa35cd8dd8fc86045f194cd5c97..6b462acda690882915e45c5df1556180d1a6d998 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
@@ -25,22 +25,33 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 
 public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.about_linearlayout);
+        setContentView(R.layout.about_coordinatorlayout);
+
+        // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21.
+        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 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);
     }
 
@@ -72,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);
@@ -91,6 +102,4 @@ public class AboutActivity extends AppCompatActivity {
             return AboutTabFragment.createTab(tab);
         }
     }
-
-
 }