am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp * commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843': GlobalTime: Perform Zoom In and Out only after initialization
This commit is contained in:
committed by
Android Git Automerger
commit
3d925ea9e8
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user