diff options
author | Jack Palevich <jack.palevich@gmail.com> | 2015-04-14 09:02:55 -0700 |
---|---|---|
committer | Jack Palevich <jack.palevich@gmail.com> | 2015-04-14 09:02:55 -0700 |
commit | cf65b55d274cc891e483a46e23246a26c06d4baf (patch) | |
tree | 3ded01753323cc5fc80094f50b0ee3f720ff9eed | |
parent | 8bcf2e354d3e8f2dc4cf8bb89382b53aa498bc69 (diff) | |
download | AndroidTerm-cf65b55d274cc891e483a46e23246a26c06d4baf.tar.gz |
Revert "Merge branch 'dvhh-TV-Mode'"
This reverts commit 8bcf2e354d3e8f2dc4cf8bb89382b53aa498bc69, reversing
changes made to 310ad8fef29dc05e52276b55b56e46ec227ceda7.
9 files changed, 11 insertions, 118 deletions
diff --git a/emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java b/emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java index 0e6ffb2..ba192f9 100644 --- a/emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java +++ b/emulatorview/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java @@ -43,7 +43,6 @@ import android.view.GestureDetector; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import android.view.ViewParent; import android.view.inputmethod.BaseInputConnection; import android.view.inputmethod.CompletionInfo; import android.view.inputmethod.CorrectionInfo; @@ -1102,7 +1101,7 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe x > 255-32 || y > 255-32; //Log.d(TAG, "mouse button "+x+","+y+","+button_code+",oob="+out_of_bounds); if(button_code < 0 || button_code > 255-32) { - Log.e(TAG, "mouse button_code out of range: " + button_code); + Log.e(TAG, "mouse button_code out of range: "+button_code); return; } if(!out_of_bounds) { @@ -1469,8 +1468,8 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe } private void updateSize(int w, int h) { - mColumns = Math.max(1, (int) Math.floor(((float) w) / mCharacterWidth)); - mVisibleColumns = Math.max(1, (int) Math.floor(((float) mVisibleWidth) / mCharacterWidth)); + mColumns = Math.max(1, (int) (((float) w) / mCharacterWidth)); + mVisibleColumns = Math.max(1, (int) (((float) mVisibleWidth) / mCharacterWidth)); mTopOfScreenMargin = mTextRenderer.getTopMargin(); mRows = Math.max(1, (h - mTopOfScreenMargin) / mCharacterHeight); @@ -1494,18 +1493,9 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe //Need to clear saved links on each display refresh mLinkLayer.clear(); if (mKnownSize) { - - int w = getWidth() - getPaddingLeft() -getPaddingRight(); - int h = getHeight() -getPaddingTop() -getPaddingBottom(); - ViewParent parent=getParent(); - while(parent instanceof View) { - w -= ((View) parent).getPaddingLeft() + ((View) parent).getPaddingRight(); - h -= ((View) parent).getPaddingTop() + ((View) parent).getPaddingBottom(); - parent = ((View)parent).getParent(); - } - - //Log.w("Term", "(" + w + ", " + h + ")"); - + int w = getWidth(); + int h = getHeight(); + // Log.w("Term", "(" + w + ", " + h + ")"); if (force || w != mVisibleWidth || h != mVisibleHeight) { mVisibleWidth = w; mVisibleHeight = h; @@ -1721,5 +1711,4 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe else return null; } - } diff --git a/term/src/main/java/jackpal/androidterm/RemoteInterface.java b/term/src/main/java/jackpal/androidterm/RemoteInterface.java index d28b1fa..a595c59 100644 --- a/term/src/main/java/jackpal/androidterm/RemoteInterface.java +++ b/term/src/main/java/jackpal/androidterm/RemoteInterface.java @@ -65,7 +65,7 @@ public class RemoteInterface extends Activity { super.onCreate(savedInstanceState); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - mSettings = new TermSettings(this, prefs); + mSettings = new TermSettings(getResources(), prefs); Intent TSIntent = new Intent(this, TermService.class); mTSIntent = TSIntent; diff --git a/term/src/main/java/jackpal/androidterm/Term.java b/term/src/main/java/jackpal/androidterm/Term.java index 8ba896b..9eeb847 100644 --- a/term/src/main/java/jackpal/androidterm/Term.java +++ b/term/src/main/java/jackpal/androidterm/Term.java @@ -21,7 +21,6 @@ import jackpal.androidterm.compat.ActionBarCompat; import jackpal.androidterm.compat.ActivityCompat; import jackpal.androidterm.compat.AndroidCompat; import jackpal.androidterm.compat.MenuItemCompat; -import jackpal.androidterm.compat.UIModeCompat; import jackpal.androidterm.emulatorview.EmulatorView; import jackpal.androidterm.emulatorview.TermSession; import jackpal.androidterm.emulatorview.UpdateCallback; @@ -39,7 +38,6 @@ import java.util.Locale; import android.app.Activity; import android.app.AlertDialog; -import android.app.UiModeManager; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -62,7 +60,6 @@ import android.os.PowerManager; import android.preference.PreferenceManager; import android.util.DisplayMetrics; import android.util.Log; -import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.GestureDetector.SimpleOnGestureListener; @@ -333,15 +330,15 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. Log.v(TermDebug.LOG_TAG, "onCreate"); - final SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this); - mSettings = new TermSettings(this, mPrefs); - mPrefs.registerOnSharedPreferenceChangeListener(this); - mPrivateAlias = new ComponentName(this, RemoteInterface.PRIVACT_ACTIVITY_ALIAS); if (icicle == null) onNewIntent(getIntent()); + final SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this); + mSettings = new TermSettings(getResources(), mPrefs); + mPrefs.registerOnSharedPreferenceChangeListener(this); + Intent broadcast = new Intent(ACTION_PATH_BROADCAST); if (AndroidCompat.SDK >= 12) { broadcast.addFlags(FLAG_INCLUDE_STOPPED_PACKAGES); @@ -402,7 +399,6 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. mAlreadyStarted = true; } - private String makePathFromBundle(Bundle extras) { if (extras == null || extras.size() == 0) { return ""; @@ -528,7 +524,6 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. private TermView createEmulatorView(TermSession session) { DisplayMetrics metrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(metrics); - TermView emulatorView = new TermView(this, session, metrics); emulatorView.setExtGestureListener(new EmulatorViewGestureListener(emulatorView)); @@ -591,11 +586,6 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. } } - /* - EmulatorView v = (EmulatorView) mViewFlipper.getCurrentView(); - if(v!=null) - v.updateSize(true); - */ int orientation = mSettings.getScreenOrientation(); int o = 0; if (orientation == 0) { @@ -607,7 +597,6 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. } else { /* Shouldn't be happened. */ } - setRequestedOrientation(o); } diff --git a/term/src/main/java/jackpal/androidterm/TermViewFlipper.java b/term/src/main/java/jackpal/androidterm/TermViewFlipper.java index ff82c24..ea90197 100644 --- a/term/src/main/java/jackpal/androidterm/TermViewFlipper.java +++ b/term/src/main/java/jackpal/androidterm/TermViewFlipper.java @@ -20,12 +20,10 @@ import java.util.Iterator; import java.util.LinkedList; import android.content.Context; -import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Rect; import android.os.Handler; import android.util.AttributeSet; -import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.widget.Toast; @@ -102,33 +100,11 @@ public class TermViewFlipper extends ViewFlipper implements Iterable<View> { Gravity.TOP|Gravity.LEFT); } - protected int dpToPixel(int input) { - Resources r = getResources(); - int px = (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, - input, - r.getDisplayMetrics() - ); - return px; - } - public void updatePrefs(TermSettings settings) { boolean statusBarVisible = settings.showStatusBar(); int[] colorScheme = settings.getColorScheme(); setBackgroundColor(colorScheme[1]); mStatusBarVisible = statusBarVisible; - if(settings.getSafeMargins()) { - setPadding( - dpToPixel(48), dpToPixel(27), - dpToPixel(48), dpToPixel(27) - ); - }else{ - setPadding(0, 0, 0, 0); - } - EmulatorView view = (EmulatorView) getCurrentView(); - if (view != null) { - view.updateSize(true); - } } public Iterator<View> iterator() { diff --git a/term/src/main/java/jackpal/androidterm/compat/UIModeCompat.java b/term/src/main/java/jackpal/androidterm/compat/UIModeCompat.java deleted file mode 100644 index 2790935..0000000 --- a/term/src/main/java/jackpal/androidterm/compat/UIModeCompat.java +++ /dev/null @@ -1,33 +0,0 @@ -package jackpal.androidterm.compat; - -import android.annotation.TargetApi; -import android.app.UiModeManager; -import android.content.Context; -import android.content.res.Configuration; - -/** - * Shim for detecting UI Mode - */ - -public class UIModeCompat { - private static class Api8OrLater { - @TargetApi(8) - public static boolean isUIModeTV(Context context) { - boolean result=false; - UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE); - if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { - result=true; - } - uiModeManager=null; - return result; - } - } - - public static boolean isUIModeTV(Context context) { - boolean result=false; - if(AndroidCompat.SDK >= 8) { - result=Api8OrLater.isUIModeTV(context); - } - return result; - } -} diff --git a/term/src/main/java/jackpal/androidterm/util/TermSettings.java b/term/src/main/java/jackpal/androidterm/util/TermSettings.java index 3449811..8ef5bf2 100644 --- a/term/src/main/java/jackpal/androidterm/util/TermSettings.java +++ b/term/src/main/java/jackpal/androidterm/util/TermSettings.java @@ -18,9 +18,7 @@ package jackpal.androidterm.util; import jackpal.androidterm.R; import jackpal.androidterm.compat.AndroidCompat; -import jackpal.androidterm.compat.UIModeCompat; -import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; import android.view.KeyEvent; @@ -34,7 +32,6 @@ public class TermSettings { private int mStatusBar; private int mActionBarMode; private int mOrientation; - private boolean mSafeMargins; private int mCursorStyle; private int mCursorBlink; private int mFontSize; @@ -66,7 +63,6 @@ public class TermSettings { private static final String STATUSBAR_KEY = "statusbar"; private static final String ACTIONBAR_KEY = "actionbar"; private static final String ORIENTATION_KEY = "orientation"; - private static final String SAFE_MARGINS_KEY = "safe_margins"; private static final String FONTSIZE_KEY = "fontsize"; private static final String COLOR_KEY = "color"; private static final String UTF8_KEY = "utf8_by_default"; @@ -161,15 +157,6 @@ public class TermSettings { readPrefs(prefs); } - public TermSettings(Context context, SharedPreferences prefs) { - readDefaultPrefs(context); - readPrefs(prefs); - } - private void readDefaultPrefs(Context context) { - Resources res=context.getResources(); - readDefaultPrefs(res); - mSafeMargins = UIModeCompat.isUIModeTV(context); - } private void readDefaultPrefs(Resources res) { mStatusBar = Integer.parseInt(res.getString(R.string.pref_statusbar_default)); mActionBarMode = res.getInteger(R.integer.pref_actionbar_default); @@ -195,7 +182,6 @@ public class TermSettings { mAltSendsEsc = res.getBoolean(R.bool.pref_alt_sends_esc_default); mMouseTracking = res.getBoolean(R.bool.pref_mouse_tracking_default); mUseKeyboardShortcuts = res.getBoolean(R.bool.pref_use_keyboard_shortcuts_default); - mSafeMargins = res.getBoolean(R.bool.pref_safe_margins_default); } public void readPrefs(SharedPreferences prefs) { @@ -203,7 +189,6 @@ public class TermSettings { mStatusBar = readIntPref(STATUSBAR_KEY, mStatusBar, 1); mActionBarMode = readIntPref(ACTIONBAR_KEY, mActionBarMode, ACTION_BAR_MODE_MAX); mOrientation = readIntPref(ORIENTATION_KEY, mOrientation, 2); - mSafeMargins = readBooleanPref(SAFE_MARGINS_KEY,mSafeMargins); // mCursorStyle = readIntPref(CURSORSTYLE_KEY, mCursorStyle, 2); // mCursorBlink = readIntPref(CURSORBLINK_KEY, mCursorBlink, 1); mFontSize = readIntPref(FONTSIZE_KEY, mFontSize, 288); @@ -262,8 +247,6 @@ public class TermSettings { return mOrientation; } - public boolean getSafeMargins() {return mSafeMargins; } - public int getCursorStyle() { return mCursorStyle; } @@ -387,5 +370,4 @@ public class TermSettings { public String getHomePath() { return mHomePath; } - } diff --git a/term/src/main/res/values/defaults.xml b/term/src/main/res/values/defaults.xml index 7279b5f..9214dd6 100644 --- a/term/src/main/res/values/defaults.xml +++ b/term/src/main/res/values/defaults.xml @@ -4,7 +4,6 @@ <string name="pref_statusbar_default" translatable="false">1</string> <integer name="pref_actionbar_default">1</integer> <integer name="pref_orientation_default">0</integer> - <bool name="pref_safe_margins_default">false</bool> <string name="pref_cursorstyle_default" translatable="false">0</string> <string name="pref_cursorblink_default" translatable="false">0</string> <string name="pref_fontsize_default" translatable="false">10</string> diff --git a/term/src/main/res/values/strings.xml b/term/src/main/res/values/strings.xml index d7fca8e..3ca3927 100644 --- a/term/src/main/res/values/strings.xml +++ b/term/src/main/res/values/strings.xml @@ -62,9 +62,6 @@ <string name="summary_orientation_preference">Choose the screen orientation behavior.</string> <string name="dialog_title_orientation_preference">Screen orientation behavior</string> - <string name="title_safe_margins_preference">Safe margins</string> - <string name="summary_safe_margins_preference">Add overscan margins to the terminal screen.</string> - <string name="title_cursorstyle_preference">Cursor style</string> <string name="summary_cursorstyle_preference">Choose cursor style.</string> <string name="dialog_title_cursorstyle_preference">Cursor style</string> diff --git a/term/src/main/res/xml/preferences.xml b/term/src/main/res/xml/preferences.xml index c46037a..e44b267 100644 --- a/term/src/main/res/xml/preferences.xml +++ b/term/src/main/res/xml/preferences.xml @@ -48,12 +48,6 @@ android:entryValues="@array/entryvalues_orientation_preference" android:dialogTitle="@string/dialog_title_orientation_preference" /> - <CheckBoxPreference - android:key="safe_margins" - android:defaultValue="@bool/pref_safe_margins_default" - android:title="@string/title_safe_margins_preference" - android:summary="@string/summary_safe_margins_preference" - /> <!-- <ListPreference android:key="cursorstyle" |