merge from open-source master
Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f
This commit is contained in:
@@ -21,7 +21,6 @@ import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.Window;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.example.android.lunarlander.LunarView.LunarThread;
|
||||
|
||||
@@ -509,7 +509,7 @@ class LunarView extends SurfaceView implements SurfaceHolder.Callback {
|
||||
mCanvasHeight = height;
|
||||
|
||||
// don't forget to resize the background image
|
||||
mBackgroundImage = mBackgroundImage.createScaledBitmap(
|
||||
mBackgroundImage = Bitmap.createScaledBitmap(
|
||||
mBackgroundImage, width, height, true);
|
||||
}
|
||||
}
|
||||
@@ -539,8 +539,6 @@ class LunarView extends SurfaceView implements SurfaceHolder.Callback {
|
||||
if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) okStart = true;
|
||||
if (keyCode == KeyEvent.KEYCODE_S) okStart = true;
|
||||
|
||||
boolean center = (keyCode == KeyEvent.KEYCODE_DPAD_UP);
|
||||
|
||||
if (okStart
|
||||
&& (mMode == STATE_READY || mMode == STATE_LOSE || mMode == STATE_WIN)) {
|
||||
// ready-to-start -> start
|
||||
|
||||
Reference in New Issue
Block a user