Some cleanup.

Change-Id: Ifac675898046550cb9e8abd6e7bde7de5bd55a47

3 files changed, 21 insertions, 62 deletions

diff --git a/src/com/android/terminal/TerminalActivity.java b/src/com/android/terminal/TerminalActivity.java
index 875ef2b..87c8510 100644
--- a/src/com/android/terminal/TerminalActivity.java
+++ b/src/com/android/terminal/TerminalActivity.java
@@ -147,13 +147,13 @@ public class TerminalActivity extends Activity {
         }
     };
 
-    private final View.OnSystemUiVisibilityChangeListener mUiVisibilityChangeListener = new View.OnSystemUiVisibilityChangeListener() {
+    private final View.OnSystemUiVisibilityChangeListener mUiVisibilityChangeListener =
+            new View.OnSystemUiVisibilityChangeListener() {
         @Override
         public void onSystemUiVisibilityChange(int visibility) {
             if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
                 getActionBar().hide();
-            }
-            else {
+            } else {
                 getActionBar().show();
             }
         }
@@ -161,26 +161,21 @@ public class TerminalActivity extends Activity {
 
     public void updatePreferences() {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean bval;
-        bval = sp.getBoolean(TerminalSettingsActivity.KEY_FULLSCREEN_MODE, false);
-        if (bval) {
+        if (sp.getBoolean(TerminalSettingsActivity.KEY_FULLSCREEN_MODE, false)) {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
             getActionBar().hide();
-        }
-        else {
+        } else {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
             getActionBar().show();
         }
 
-        String sval;
-        sval = sp.getString(TerminalSettingsActivity.KEY_SCREEN_ORIENTATION, "automatic");
-        if (sval.equals("automatic")) {
+        final String orientation = sp.getString(TerminalSettingsActivity.KEY_SCREEN_ORIENTATION,
+                "automatic");
+        if (orientation.equals("automatic")) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
-        }
-        if (sval.equals("portrait")) {
+        } else if (orientation.equals("portrait")) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        }
-        if (sval.equals("landscape")) {
+        } else if (orientation.equals("landscape")) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
 
@@ -218,15 +213,14 @@ public class TerminalActivity extends Activity {
     @Override
     protected void onStart() {
         super.onStart();
-        updatePreferences();
-        bindService(
-                new Intent(this, TerminalService.class), mServiceConn, Context.BIND_AUTO_CREATE);
+        bindService(new Intent(this, TerminalService.class),
+                mServiceConn, Context.BIND_AUTO_CREATE);
     }
 
     @Override
     protected void onResume() {
-        super.onResume();
         updatePreferences();
+        super.onResume();
     }
 
     @Override
diff --git a/src/com/android/terminal/TerminalSettingsActivity.java b/src/com/android/terminal/TerminalSettingsActivity.java
index 1e4338a..3a37ebb 100644
--- a/src/com/android/terminal/TerminalSettingsActivity.java
+++ b/src/com/android/terminal/TerminalSettingsActivity.java
@@ -30,8 +30,7 @@ import static com.android.terminal.Terminal.TAG;
 /**
  * Settings for Terminal.
  */
-public class TerminalSettingsActivity extends PreferenceActivity
-        implements Preference.OnPreferenceChangeListener {
+public class TerminalSettingsActivity extends PreferenceActivity {
 
     public static final String KEY_FULLSCREEN_MODE = "fullscreen_mode";
     public static final String KEY_SCREEN_ORIENTATION = "screen_orientation";
@@ -50,21 +49,13 @@ public class TerminalSettingsActivity extends PreferenceActivity
 
         mFullscreenModePref = (CheckBoxPreference) findPreference(KEY_FULLSCREEN_MODE);
         mScreenOrientationPref = (ListPreference) findPreference(KEY_SCREEN_ORIENTATION);
-        mScreenOrientationPref.setOnPreferenceChangeListener(this);
         mFontSizePref = (ListPreference) findPreference(KEY_FONT_SIZE);
-        mFontSizePref.setOnPreferenceChangeListener(this);
         mTextColorsPref = (ListPreference) findPreference(KEY_TEXT_COLORS);
-        mTextColorsPref.setOnPreferenceChangeListener(this);
 
         getActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
@@ -73,33 +64,4 @@ public class TerminalSettingsActivity extends PreferenceActivity
         }
         return super.onOptionsItemSelected(item);
     }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
-        if (KEY_FULLSCREEN_MODE.equals(preference.getKey())) {
-            CheckBoxPreference pref = (CheckBoxPreference) preference;
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (KEY_SCREEN_ORIENTATION.equals(preference.getKey())) {
-            ListPreference pref = (ListPreference) preference;
-            String val = (String) newValue;
-            int idx = pref.findIndexOfValue(val);
-        }
-        if (KEY_FONT_SIZE.equals(preference.getKey())) {
-            ListPreference pref = (ListPreference) preference;
-            String val = (String) newValue;
-            int idx = pref.findIndexOfValue(val);
-        }
-        if (KEY_TEXT_COLORS.equals(preference.getKey())) {
-            ListPreference pref = (ListPreference) preference;
-            String val = (String) newValue;
-            int idx = pref.findIndexOfValue(val);
-        }
-        return true;
-    }
 }
diff --git a/src/com/android/terminal/TerminalView.java b/src/com/android/terminal/TerminalView.java
index 0246167..ce75df6 100644
--- a/src/com/android/terminal/TerminalView.java
+++ b/src/com/android/terminal/TerminalView.java
@@ -124,7 +124,8 @@ public class TerminalView extends ListView {
         activity.updatePreferences();
     }
 
-    private final AdapterView.OnItemClickListener mClickListener = new AdapterView.OnItemClickListener() {
+    private final AdapterView.OnItemClickListener mClickListener =
+            new AdapterView.OnItemClickListener() {
         @Override
         public void onItemClick(AdapterView<?> parent, View v, int pos, long id) {
             // Clicking on top half of view toggles fullscreen mode
@@ -134,7 +135,8 @@ public class TerminalView extends ListView {
             }
             // Clicking on bottom half of view shows soft keyboard
             if (parent.requestFocus()) {
-                InputMethodManager imm = (InputMethodManager) parent.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                InputMethodManager imm = (InputMethodManager)
+                        parent.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showSoftInput(parent, InputMethodManager.SHOW_IMPLICIT);
             }
         }
@@ -227,7 +229,8 @@ public class TerminalView extends ListView {
         }
 
         @Override
-        public void onMoveCursor(int posRow, int posCol, int oldPosRow, int oldPosCol, int visible) {
+        public void onMoveCursor(int posRow, int posCol, int oldPosRow,
+                int oldPosCol, int visible) {
             post(mDamageRunnable);
         }
 
@@ -375,7 +378,7 @@ public class TerminalView extends ListView {
         if (idx != -1) {
             try {
                 fg = Color.parseColor(val.substring(0, idx));
-                bg = Color.parseColor(val.substring(idx+1));
+                bg = Color.parseColor(val.substring(idx + 1));
             }
             catch (IllegalArgumentException e) {
                 // Ignore