Correctly resize terminal, hook up colors.

Resize needed to kick the vterm library.  Hook up colors to CellRun
and cluster cells into single run until style changes.

Change-Id: Ib2984d8eedaf6085aba98df7997104b59a832967

2 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/terminal/Terminal.java b/src/com/android/terminal/Terminal.java
index ff325a8..d37e6a8 100644
--- a/src/com/android/terminal/Terminal.java
+++ b/src/com/android/terminal/Terminal.java
@@ -44,8 +44,8 @@ public class Terminal {
         boolean strike;
         int font;
 
-        int fgColor = Color.RED;
-        int bgColor = Color.BLUE;
+        int fg = Color.RED;
+        int bg = Color.BLUE;
     }
 
     public interface TerminalClient {
diff --git a/src/com/android/terminal/TerminalView.java b/src/com/android/terminal/TerminalView.java
index 79b5bb4..35192e9 100644
--- a/src/com/android/terminal/TerminalView.java
+++ b/src/com/android/terminal/TerminalView.java
@@ -189,8 +189,8 @@ public class TerminalView extends View {
             for (int col = startCol; col <= endCol;) {
                 mTerm.getCellRun(row, col, run);
 
-                mBgPaint.setColor(run.bgColor);
-                mTextPaint.setColor(run.fgColor);
+                mBgPaint.setColor(run.bg);
+                mTextPaint.setColor(run.fg);
 
                 final int y = row * mCharHeight;
                 final int x = col * mCharWidth;