Term: materialize

* New icon
* Material UI
* Vectors

Change-Id: Ia5c3c9027662edd51021bf2183cd203d25bb7474

3 files changed, 18 insertions, 4 deletions

diff --git a/src/com/android/terminal/TerminalActivity.java b/src/com/android/terminal/TerminalActivity.java
index 475ce40..875ef2b 100644
--- a/src/com/android/terminal/TerminalActivity.java
+++ b/src/com/android/terminal/TerminalActivity.java
@@ -18,6 +18,7 @@ package com.android.terminal;
 
 import static com.android.terminal.Terminal.TAG;
 
+import android.animation.LayoutTransition;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ -38,6 +39,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toolbar;
 
 /**
  * Activity that displays all {@link Terminal} instances running in a bound
@@ -198,6 +200,9 @@ public class TerminalActivity extends Activity {
 
         setContentView(R.layout.activity);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setActionBar(toolbar);
+
         mPager = (ViewPager) findViewById(R.id.pager);
         mTitles = (PagerTitleStrip) findViewById(R.id.titles);
 
@@ -205,6 +210,9 @@ public class TerminalActivity extends Activity {
 
         View decorView = getWindow().getDecorView();
         decorView.setOnSystemUiVisibilityChangeListener(mUiVisibilityChangeListener);
+
+        ViewGroup root = (ViewGroup) findViewById(R.id.root);
+        root.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
     }
 
     @Override
diff --git a/src/com/android/terminal/TerminalSettingsActivity.java b/src/com/android/terminal/TerminalSettingsActivity.java
index 6fd7b16..1e4338a 100644
--- a/src/com/android/terminal/TerminalSettingsActivity.java
+++ b/src/com/android/terminal/TerminalSettingsActivity.java
@@ -23,7 +23,6 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
 
 import static com.android.terminal.Terminal.TAG;
@@ -56,6 +55,8 @@ public class TerminalSettingsActivity extends PreferenceActivity
         mFontSizePref.setOnPreferenceChangeListener(this);
         mTextColorsPref = (ListPreference) findPreference(KEY_TEXT_COLORS);
         mTextColorsPref.setOnPreferenceChangeListener(this);
+
+        getActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     @Override
@@ -65,6 +66,11 @@ public class TerminalSettingsActivity extends PreferenceActivity
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/src/com/android/terminal/TerminalView.java b/src/com/android/terminal/TerminalView.java
index 974136a..0246167 100644
--- a/src/com/android/terminal/TerminalView.java
+++ b/src/com/android/terminal/TerminalView.java
@@ -368,9 +368,9 @@ public class TerminalView extends ListView {
         val = sp.getString(TerminalSettingsActivity.KEY_FONT_SIZE, "12");
         mMetrics.setTextSize(ptToDp(Float.parseFloat(val)));
 
-        val = sp.getString(TerminalSettingsActivity.KEY_TEXT_COLORS, "black/white");
-        int fg = 0x000000;
-        int bg = 0xffffff;
+        val = sp.getString(TerminalSettingsActivity.KEY_TEXT_COLORS, "white/black");
+        int fg = 0xfafafa;
+        int bg = 0x212121;
         int idx = val.indexOf('/');
         if (idx != -1) {
             try {