Merge pull request jackpal#414 from jspricke/hide_material_design_action_bar

Allow hiding of Material Design ActionBar

Author: jackpal

term/src/main/java/jackpal/androidterm/Term.java

@@ -345,16 +345,18 @@ public void onCreate(Bundle icicle) {
             Log.w(TermDebug.LOG_TAG, "bind to service failed!");
         }
 
-        if (AndroidCompat.V11ToV20) {
+        if (AndroidCompat.SDK >= 11) {
             int actionBarMode = mSettings.actionBarMode();
             mActionBarMode = actionBarMode;
-            switch (actionBarMode) {
-            case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
-                setTheme(R.style.Theme_Holo);
-                break;
-            case TermSettings.ACTION_BAR_MODE_HIDES:
-                setTheme(R.style.Theme_Holo_ActionBarOverlay);
-                break;
+            if (AndroidCompat.V11ToV20) {
+                switch (actionBarMode) {
+                case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
+                    setTheme(R.style.Theme_Holo);
+                    break;
+                case TermSettings.ACTION_BAR_MODE_HIDES:
+                    setTheme(R.style.Theme_Holo_ActionBarOverlay);
+                    break;
+                }
             }
         } else {
             mActionBarMode = TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE;

term/src/main/java/jackpal/androidterm/TermPreferences.java

@@ -36,9 +36,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
-        // Remove the action bar pref on non-Holo platforms.
-        // On pre and post holo platforms there is no action bar.
-        if (!AndroidCompat.V11ToV20) {
+        // Remove the action bar pref on older platforms without an action bar
+        if (AndroidCompat.SDK < 11) {
             Preference actionBarPref = findPreference(ACTIONBAR_KEY);
              PreferenceCategory screenCategory =
                     (PreferenceCategory) findPreference(CATEGORY_SCREEN_KEY);

term/src/main/java/jackpal/androidterm/compat/AndroidCompat.java

@@ -23,13 +23,6 @@ public class AndroidCompat {
         V11ToV20 = (SDK >= 11) && (SDK <= 20);
     }
 
-    // The era of Material Design
-    public final static boolean V21Up;
-
-    static {
-        V21Up = SDK >= 21;
-    }
-
     private final static int getSDK() {
         int result;
         try {

term/src/main/java/jackpal/androidterm/util/TermSettings.java

@@ -188,10 +188,6 @@ public void readPrefs(SharedPreferences prefs) {
         mPrefs = prefs;
         mStatusBar = readIntPref(STATUSBAR_KEY, mStatusBar, 1);
         mActionBarMode = readIntPref(ACTIONBAR_KEY, mActionBarMode, ACTION_BAR_MODE_MAX);
-        if (AndroidCompat.V21Up) {
-            // ActionBar replaced by Taskbar in Material Design. TODO: Implement scroll hiding.
-            mActionBarMode = ACTION_BAR_MODE_ALWAYS_VISIBLE;
-        }
         mOrientation = readIntPref(ORIENTATION_KEY, mOrientation, 2);
         // mCursorStyle = readIntPref(CURSORSTYLE_KEY, mCursorStyle, 2);
         // mCursorBlink = readIntPref(CURSORBLINK_KEY, mCursorBlink, 1);