am 3d925ea9: am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization

Merge commit '3d925ea9e884000a7e5e8e18c681967f9550b15d'

* commit '3d925ea9e884000a7e5e8e18c681967f9550b15d':
  GlobalTime: Perform Zoom In and Out only after initialization
This commit is contained in:
Vairavan Srinivasan
2010-09-10 16:36:56 -07:00
committed by Android Git Automerger

View File

@@ -898,7 +898,7 @@ class GTView extends SurfaceView implements SurfaceHolder.Callback {
// The '2' key zooms out // The '2' key zooms out
case KeyEvent.KEYCODE_2: case KeyEvent.KEYCODE_2:
if (!mAlphaKeySet && !mDisplayWorldFlat) { if (!mAlphaKeySet && !mDisplayWorldFlat && mInitialized) {
mGLView.zoom(-2); mGLView.zoom(-2);
handled = true; handled = true;
} }
@@ -906,7 +906,7 @@ class GTView extends SurfaceView implements SurfaceHolder.Callback {
// The '8' key zooms in // The '8' key zooms in
case KeyEvent.KEYCODE_8: case KeyEvent.KEYCODE_8:
if (!mAlphaKeySet && !mDisplayWorldFlat) { if (!mAlphaKeySet && !mDisplayWorldFlat && mInitialized) {
mGLView.zoom(2); mGLView.zoom(2);
handled = true; handled = true;
} }