コミット: c5b4ec402fb96f1df1e83e22cef16785035aae90 - packages-apps-AndroidTerm (git)

packages/apps/AndroidTerm

コミットメタ情報

• リビジョン: c5b4ec402fb96f1df1e83e22cef16785035aae90 (tree)
• 日時: 2012-03-26 10:21:48
• 作者: Steven Luo <steven+android@stev...>
• コミッター: Jack Palevich

ログメッセージ

Revise screen resize check handling

Move the screen resize check code out of EmulatorView and into
TermViewFlipper, where it logically fits now that there are multiple
EmulatorViews per Term activity. While we're at it, instead of making
the activity tell us how much of the window doesn't belong to us, use
getGlobalVisibleRect() to figure that out ourselves, eliminating the
need for a WindowSizeCallback.

Signed-off-by: Jack Palevich <[e-mail]>

変更サマリ

• modified: src/jackpal/androidterm/EmulatorView.java
• modified: src/jackpal/androidterm/Term.java
• modified: src/jackpal/androidterm/TermViewFlipper.java

差分

--- a/src/jackpal/androidterm/EmulatorView.java
+++ b/src/jackpal/androidterm/EmulatorView.java
@@ -39,7 +39,6 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
 import android.view.inputmethod.CompletionInfo;
 import android.view.inputmethod.CorrectionInfo;
 import android.view.inputmethod.EditorInfo;
@@ -75,7 +74,6 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
 
     private int mVisibleWidth;
     private int mVisibleHeight;
-    private Rect mVisibleRect = new Rect();
 
     private TermSession mTermSession;
 
@@ -163,8 +161,6 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
 
     private static final int CURSOR_BLINK_PERIOD = 1000;
 
-    private static final int SCREEN_CHECK_PERIOD = 1000;
-
     private boolean mCursorVisible = true;
 
     private boolean mIsSelectingText = false;
@@ -186,22 +182,6 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
 
     private boolean mIsActive = false;
 
-    /**
-     * True if we must poll to discover if the view has changed size.
-     * This is the only known way to detect the view changing size due to
-     * the IME being shown or hidden in API level <= 7.
-     */
-    private boolean mbPollForWindowSizeChange = AndroidCompat.SDK <= 7;
-
-    private Runnable mCheckSize = mbPollForWindowSizeChange
-        ? new Runnable() {
-            public void run() {
-                updateSize(false);
-                mHandler.postDelayed(this, SCREEN_CHECK_PERIOD);
-            }
-        }
-        : null;
-
     private Runnable mBlinkCursor = new Runnable() {
         public void run() {
             if (mCursorBlink != 0) {
@@ -215,21 +195,13 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
         }
     };
 
-    private boolean mRedoLayout = false;
-
     private GestureDetector mGestureDetector;
     private GestureDetector.OnGestureListener mExtGestureListener;
     private float mScrollRemainder;
     private TermKeyListener mKeyListener;
-    private WindowSizeCallback mSizeCallback;
 
     private String mImeBuffer = "";
 
-    // Used by activity to inform us how much of the window belongs to us
-    public interface WindowSizeCallback {
-        public abstract void onGetSize(Rect rect);
-    }
-
     /**
      * Our message handler class. Implements a periodic callback.
      */
@@ -266,18 +238,12 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
     public void onResume() {
         mIsActive = true;
         updateSize(false);
-        if (mbPollForWindowSizeChange) {
-            mHandler.postDelayed(mCheckSize, SCREEN_CHECK_PERIOD);
-        }
         if (mCursorBlink != 0) {
             mHandler.postDelayed(mBlinkCursor, CURSOR_BLINK_PERIOD);
         }
     }
 
     public void onPause() {
-        if (mbPollForWindowSizeChange) {
-            mHandler.removeCallbacks(mCheckSize);
-        }
         if (mCursorBlink != 0) {
             mHandler.removeCallbacks(mBlinkCursor);
         }
@@ -628,10 +594,6 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
         mKeyListener = new TermKeyListener(session);
     }
 
-    public void setWindowSizeCallback(WindowSizeCallback callback) {
-        mSizeCallback = callback;
-    }
-
     public void setExtGestureListener(GestureDetector.OnGestureListener listener) {
         mExtGestureListener = listener;
     }
@@ -988,53 +950,20 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
 
     public void updateSize(boolean force) {
         if (mKnownSize) {
-            getWindowVisibleDisplayFrame(mVisibleRect);
-            /* Work around bug in getWindowVisibleDisplayFrame, and avoid
-               distracting visual glitch otherwise */
-            if (!mSettings.showStatusBar()) {
-                mVisibleRect.top = 0;
-            }
-            if (mSizeCallback != null) {
-                // Let activity adjust our size
-                mSizeCallback.onGetSize(mVisibleRect);
-            }
-            int w = mVisibleRect.width();
-            int h = mVisibleRect.height();
+            int w = getWidth();
+            int h = getHeight();
             // Log.w("Term", "(" + w + ", " + h + ")");
             if (force || w != mVisibleWidth || h != mVisibleHeight) {
                 mVisibleWidth = w;
                 mVisibleHeight = h;
-
-                LayoutParams params = getLayoutParams();
-                params.width = w;
-                params.height = h;
-                setLayoutParams(params);
-                mRedoLayout = true;
-
                 updateSize(mVisibleWidth, mVisibleHeight);
             }
         }
     }
 
-    /**
-     * Called when the view changes size.
-     * (Note: Not always called on Android 1.5 or Android 1.6)
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (mIsActive) {
-            updateSize(false);
-        }
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         updateSize(false);
-        if (mRedoLayout) {
-            requestLayout();
-            mRedoLayout = false;
-        }
 
         if (mEmulator == null) {
             // Not ready yet

--- a/src/jackpal/androidterm/Term.java
+++ b/src/jackpal/androidterm/Term.java
@@ -203,14 +203,6 @@ public class Term extends Activity implements UpdateCallback {
         }
     }
 
-    private EmulatorView.WindowSizeCallback mSizeCallback = new EmulatorView.WindowSizeCallback() {
-        public void onGetSize(Rect rect) {
-            if (mActionBarMode == TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE) {
-                // Fixed action bar takes space away from the EmulatorView
-                rect.top += mActionBar.getHeight();
-            }
-        }
-    };
     private View.OnKeyListener mBackKeyListener = new View.OnKeyListener() {
         public boolean onKey(View v, int keyCode, KeyEvent event) {
             if (keyCode == KeyEvent.KEYCODE_BACK && mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar.isShowing()) {
@@ -349,15 +341,7 @@ public class Term extends Activity implements UpdateCallback {
         getWindowManager().getDefaultDisplay().getMetrics(metrics);
         EmulatorView emulatorView = new EmulatorView(this, session, metrics);
 
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-            FrameLayout.LayoutParams.WRAP_CONTENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT,
-            Gravity.LEFT
-        );
-        emulatorView.setLayoutParams(params);
-
         emulatorView.setExtGestureListener(new EmulatorViewGestureListener(emulatorView));
-        emulatorView.setWindowSizeCallback(mSizeCallback);
         emulatorView.setOnKeyListener(mBackKeyListener);
         registerForContextMenu(emulatorView);
 
@@ -435,16 +419,15 @@ public class Term extends Activity implements UpdateCallback {
         if (onResumeSelectWindow >= 0) {
             mViewFlipper.setDisplayedChild(onResumeSelectWindow);
             onResumeSelectWindow = -1;
-        } else {
-            mViewFlipper.resumeCurrentView();
         }
+        mViewFlipper.onResume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
-        mViewFlipper.pauseCurrentView();
+        mViewFlipper.onPause();
         if (mTermSessions != null) {
             mTermSessions.removeCallback(this);
             if (mWinListAdapter != null) {
@@ -486,7 +469,7 @@ public class Term extends Activity implements UpdateCallback {
 
         EmulatorView v = (EmulatorView) mViewFlipper.getCurrentView();
         if (v != null) {
-            v.updateSize(true);
+            v.updateSize(false);
         }
 
         if (mWinListAdapter != null) {

--- a/src/jackpal/androidterm/TermViewFlipper.java
+++ b/src/jackpal/androidterm/TermViewFlipper.java
@@ -20,12 +20,16 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
 
+import jackpal.androidterm.compat.AndroidCompat;
 import jackpal.androidterm.model.UpdateCallback;
 import jackpal.androidterm.util.TermSettings;
 
@@ -33,6 +37,29 @@ public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
     private Context context;
     private Toast mToast;
     private LinkedList<UpdateCallback> callbacks;
+    private boolean mStatusBarVisible = false;
+
+    private int mCurWidth;
+    private int mCurHeight;
+    private Rect mVisibleRect = new Rect();
+    private Rect mWindowRect = new Rect();
+    private LayoutParams mChildParams = null;
+    private boolean mRedoLayout = false;
+
+    /**
+     * True if we must poll to discover if the view has changed size.
+     * This is the only known way to detect the view changing size due to
+     * the IME being shown or hidden in API level <= 7.
+     */
+    private boolean mbPollForWindowSizeChange = false;
+    private static final int SCREEN_CHECK_PERIOD = 1000;
+    private final Handler mHandler = new Handler();
+    private Runnable mCheckSize = new Runnable() {
+            public void run() {
+                adjustChildSize();
+                mHandler.postDelayed(this, SCREEN_CHECK_PERIOD);
+            }
+        };
 
     class ViewFlipperIterator implements Iterator<View> {
         int pos = 0;
@@ -52,19 +79,32 @@ public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
 
     public TermViewFlipper(Context context) {
         super(context);
-        this.context = context;
-        callbacks = new LinkedList<UpdateCallback>();
+        commonConstructor(context);
     }
 
     public TermViewFlipper(Context context, AttributeSet attrs) {
         super(context, attrs);
+        commonConstructor(context);
+    }
+
+    private void commonConstructor(Context context) {
         this.context = context;
         callbacks = new LinkedList<UpdateCallback>();
+
+        updateVisibleRect();
+        Rect visible = mVisibleRect;
+        mChildParams = new LayoutParams(visible.width(), visible.height(),
+            Gravity.TOP|Gravity.LEFT);
     }
 
     public void updatePrefs(TermSettings settings) {
+        mStatusBarVisible = settings.showStatusBar();
         int[] colorScheme = settings.getColorScheme();
         setBackgroundColor(colorScheme[3]);
+
+        if (AndroidCompat.SDK < 8) {
+            mbPollForWindowSizeChange = !mStatusBarVisible;
+        }
     }
 
     public Iterator<View> iterator() {
@@ -85,6 +125,20 @@ public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
         }
     }
 
+    public void onPause() {
+        if (mbPollForWindowSizeChange) {
+            mHandler.removeCallbacks(mCheckSize);
+        }
+        pauseCurrentView();
+    }
+
+    public void onResume() {
+        if (mbPollForWindowSizeChange) {
+            mCheckSize.run();
+        }
+        resumeCurrentView();
+    }
+
     public void pauseCurrentView() {
         EmulatorView view = (EmulatorView) getCurrentView();
         if (view == null) {
@@ -141,4 +195,95 @@ public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
         resumeCurrentView();
         notifyChange();
     }
+
+    @Override
+    public void addView(View v, int index) {
+        super.addView(v, index, mChildParams);
+    }
+
+    @Override
+    public void addView(View v) {
+        super.addView(v, mChildParams);
+    }
+
+    private void updateVisibleRect() {
+        Rect visible = mVisibleRect;
+        Rect window = mWindowRect;
+
+        /* Get rectangle representing visible area of this view, as seen by
+           the activity (takes other views in the layout into account, but
+           not space used by the IME) */
+        getGlobalVisibleRect(visible);
+
+        /* Get rectangle representing visible area of this window (takes
+           IME into account, but not other views in the layout) */
+        getWindowVisibleDisplayFrame(window);
+        /* Work around bug in getWindowVisibleDisplayFrame on API < 10, and
+           avoid a distracting height change as status bar hides otherwise */
+        if (!mStatusBarVisible) {
+            window.top = 0;
+        }
+
+        // Clip visible rectangle's top to the visible portion of the window
+        if (visible.width() == 0 && visible.height() == 0) {
+            visible.left = window.left;
+            visible.top = window.top;
+        } else {
+            if (visible.left < window.left) {
+                visible.left = window.left;
+            }
+            if (visible.top < window.top) {
+                visible.top = window.top;
+            }
+        }
+        // Always set the bottom of the rectangle to the window bottom
+        /* XXX This breaks with a split action bar, but if we don't do this,
+           it's possible that the view won't resize correctly on IME hide */
+        visible.right = window.right;
+        visible.bottom = window.bottom;
+    }
+
+    private void adjustChildSize() {
+        updateVisibleRect();
+        Rect visible = mVisibleRect;
+        int width = visible.width();
+        int height = visible.height();
+
+        if (mCurWidth != width || mCurHeight != height) {
+            mCurWidth = width;
+            mCurHeight = height;
+
+            LayoutParams params = mChildParams;
+            params.width = width;
+            params.height = height;
+            for (View v : this) {
+                updateViewLayout(v, params);
+            }
+            mRedoLayout = true;
+
+            EmulatorView currentView = (EmulatorView) getCurrentView();
+            if (currentView != null) {
+                currentView.updateSize(false);
+            }
+        }
+    }
+
+    /**
+     * Called when the view changes size.
+     * (Note: Not always called on Android < 2.2)
+     */
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        adjustChildSize();
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mRedoLayout) {
+            requestLayout();
+            mRedoLayout = false;
+        }
+        super.onDraw(canvas);
+    }
 }