LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Project-lib sample: externalize strings in lib." into froyo

Browse Source
This commit is contained in:
Raphael
2010-04-05 16:07:20 -07:00
committed by Android (Google) Code Review
parent 4ce5771ce7 546d7e8956
commit 1fd241b381
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/TicTacToeLib/res/values/strings.xml
View File

@@ -16,5 +16,9 @@
--> -->
<resources> <resources>
<!-- TODO externalize strings here. --> <string name="player2_win">Player 2 (computer) wins!</string>
<string name="player1_win">Player 1 (you) wins!</string>
<string name="tie">This is a tie! No one wins!</string>
<string name="player2_turn">Player 2\'s turn (that\'s the computer)</string>
<string name="player1_turn">Player 1\'s turn -- that\'s you!</string>
</resources> </resources>

10
samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
View File

@@ -106,11 +106,11 @@ public class GameActivity extends Activity {
mButtonNext.setEnabled(false); mButtonNext.setEnabled(false);
if (player == State.PLAYER1) { if (player == State.PLAYER1) {
mInfoView.setText("Player 1's turn -- that's you!"); mInfoView.setText(R.string.player1_turn);
mGameView.setEnabled(true); mGameView.setEnabled(true);
} else if (player == State.PLAYER2) { } else if (player == State.PLAYER2) {
mInfoView.setText("Player 2's turn (that's the computer)"); mInfoView.setText(R.string.player2_turn);
mGameView.setEnabled(false); mGameView.setEnabled(false);
} }
@@ -248,11 +248,11 @@ public class GameActivity extends Activity {
String text; String text;
if (player == State.EMPTY) { if (player == State.EMPTY) {
text = "This is a tie! No one wins!"; text = getString(R.string.tie);
} else if (player == State.PLAYER1) { } else if (player == State.PLAYER1) {
text = "Player 1 (you) wins!"; text = getString(R.string.player1_win);
} else { } else {
text = "Player 2 (computer) wins!"; text = getString(R.string.player2_win);
} }
mInfoView.setText(text); mInfoView.setText(text);
} }

4
samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
View File

@@ -35,7 +35,6 @@ import android.os.Message;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Handler.Callback; import android.os.Handler.Callback;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@@ -43,8 +42,6 @@ import android.view.View;
public class GameView extends View { public class GameView extends View {
private static final String TAG = "GameView";
public static final long FPS_MS = 1000/2; public static final long FPS_MS = 1000/2;
public enum State { public enum State {
@@ -280,7 +277,6 @@ public class GameView extends View {
@Override @Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) { protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh); super.onSizeChanged(w, h, oldw, oldh);
Log.d(TAG, String.format("onSizeChanged: %dx%d", w, h));
int sx = (w - 2 * MARGIN) / 3; int sx = (w - 2 * MARGIN) / 3;
int sy = (h - 2 * MARGIN) / 3; int sy = (h - 2 * MARGIN) / 3;