commit 1fd241b381c61e1068625de0a22bd7d9bb6257b8
author Raphael <raphael@google.com> Mon Apr 05 16:07:20 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 05 16:07:20 2010 -0700
tree 9dc335240abc93848745abadc85b80e570d0e61a
parent 4ce5771ce7460bb7d29b4151512d1a7811499dfe
parent 546d7e8956ef91369435bda4100bb0fb2ed1705b

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

samples/TicTacToeLib/res/values/strings.xml

diff --git a/samples/TicTacToeLib/res/values/strings.xml b/samples/TicTacToeLib/res/values/strings.xml
index 9fd8413..468975a 100755
--- a/samples/TicTacToeLib/res/values/strings.xml
+++ b/samples/TicTacToeLib/res/values/strings.xml
@@ -16,5 +16,9 @@
 -->
 
 <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>

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

diff --git a/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
index 811451f..df1cac0 100755
--- a/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
+++ b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
@@ -106,11 +106,11 @@
         mButtonNext.setEnabled(false);

 

         if (player == State.PLAYER1) {

-            mInfoView.setText("Player 1's turn -- that's you!");

+            mInfoView.setText(R.string.player1_turn);

             mGameView.setEnabled(true);

 

         } else if (player == State.PLAYER2) {

-            mInfoView.setText("Player 2's turn (that's the computer)");

+            mInfoView.setText(R.string.player2_turn);

             mGameView.setEnabled(false);

         }

 

@@ -248,11 +248,11 @@
         String text;

 

         if (player == State.EMPTY) {

-            text = "This is a tie! No one wins!";

+            text = getString(R.string.tie);

         } else if (player == State.PLAYER1) {

-            text = "Player 1 (you) wins!";

+            text = getString(R.string.player1_win);

         } else {

-            text = "Player 2 (computer) wins!";

+            text = getString(R.string.player2_win);

         }

         mInfoView.setText(text);

     }

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

diff --git a/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
index dbd43d9..3af516a 100755
--- a/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
+++ b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
@@ -35,7 +35,6 @@
 import android.os.Parcelable;

 import android.os.Handler.Callback;

 import android.util.AttributeSet;

-import android.util.Log;

 import android.view.MotionEvent;

 import android.view.View;

 

@@ -43,8 +42,6 @@
 

 public class GameView extends View {

 

-    private static final String TAG = "GameView";

-

     public static final long FPS_MS = 1000/2;

 

     public enum State {

@@ -280,7 +277,6 @@
     @Override

     protected void onSizeChanged(int w, int h, int oldw, int oldh) {

         super.onSizeChanged(w, h, oldw, oldh);

-        Log.d(TAG, String.format("onSizeChanged: %dx%d", w, h));

 

         int sx = (w - 2 * MARGIN) / 3;

         int sy = (h - 2 * MARGIN) / 3;