From bbfd2ed1c26c9839fee5d5e8963bfbe91c744fe1 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Mon, 5 Apr 2010 14:25:50 -0700
Subject: [PATCH] Project-lib sample: set namespace to com.example.android

This is a pure namespace refactoring change.

Change-Id: I33f5998f876cdc9893d8d45983422ca0e331b3c4
---
 samples/TicTacToeLib/AndroidManifest.xml                  | 2 +-
 samples/TicTacToeLib/res/layout-land/lib_game.xml         | 2 +-
 samples/TicTacToeLib/res/layout/lib_game.xml              | 2 +-
 .../{ => android}/tictactoe/library/GameActivity.java     | 8 ++++----
 .../example/{ => android}/tictactoe/library/GameView.java | 2 +-
 samples/TicTacToeMain/AndroidManifest.xml                 | 4 ++--
 .../com/example/{ => android}/tictactoe/MainActivity.java | 7 ++++---
 7 files changed, 14 insertions(+), 13 deletions(-)
 rename samples/TicTacToeLib/src/com/example/{ => android}/tictactoe/library/GameActivity.java (94%)
 rename samples/TicTacToeLib/src/com/example/{ => android}/tictactoe/library/GameView.java (96%)
 rename samples/TicTacToeMain/src/com/example/{ => android}/tictactoe/MainActivity.java (91%)

diff --git a/samples/TicTacToeLib/AndroidManifest.xml b/samples/TicTacToeLib/AndroidManifest.xml
index 9772b88c5..db44c0566 100755
--- a/samples/TicTacToeLib/AndroidManifest.xml
+++ b/samples/TicTacToeLib/AndroidManifest.xml
@@ -16,7 +16,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.tictactoe.library"
+      package="com.example.android.tictactoe.library"
       android:versionCode="1"
       android:versionName="1.0">
 </manifest>
\ No newline at end of file
diff --git a/samples/TicTacToeLib/res/layout-land/lib_game.xml b/samples/TicTacToeLib/res/layout-land/lib_game.xml
index c0f5cbab2..9777e02fe 100755
--- a/samples/TicTacToeLib/res/layout-land/lib_game.xml
+++ b/samples/TicTacToeLib/res/layout-land/lib_game.xml
@@ -22,7 +22,7 @@
     android:gravity="center_vertical|center_horizontal"
     >
 
-    <com.example.tictactoe.library.GameView
+    <com.example.android.tictactoe.library.GameView
         android:id="@+id/game_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/samples/TicTacToeLib/res/layout/lib_game.xml b/samples/TicTacToeLib/res/layout/lib_game.xml
index 75c284a68..67359833a 100755
--- a/samples/TicTacToeLib/res/layout/lib_game.xml
+++ b/samples/TicTacToeLib/res/layout/lib_game.xml
@@ -22,7 +22,7 @@
     android:gravity="center_horizontal"
     >
 
-    <com.example.tictactoe.library.GameView
+    <com.example.android.tictactoe.library.GameView
         android:id="@+id/game_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/samples/TicTacToeLib/src/com/example/tictactoe/library/GameActivity.java b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
similarity index 94%
rename from samples/TicTacToeLib/src/com/example/tictactoe/library/GameActivity.java
rename to samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
index e1514cdc2..811451f0d 100755
--- a/samples/TicTacToeLib/src/com/example/tictactoe/library/GameActivity.java
+++ b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.tictactoe.library;
+package com.example.android.tictactoe.library;
 
 import java.util.Random;
 
@@ -28,15 +28,15 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.example.tictactoe.library.GameView.ICellListener;
-import com.example.tictactoe.library.GameView.State;
+import com.example.android.tictactoe.library.GameView.ICellListener;
+import com.example.android.tictactoe.library.GameView.State;
 
 
 public class GameActivity extends Activity {
 
     /** Start player. Must be 1 or 2. Default is 1. */
     public static final String EXTRA_START_PLAYER =
-        "com.example.tictactoe.library.GameActivity.EXTRA_START_PLAYER";
+        "com.example.android.tictactoe.library.GameActivity.EXTRA_START_PLAYER";
 
     private static final int MSG_COMPUTER_TURN = 1;
     private static final long COMPUTER_DELAY_MS = 500;
diff --git a/samples/TicTacToeLib/src/com/example/tictactoe/library/GameView.java b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
similarity index 96%
rename from samples/TicTacToeLib/src/com/example/tictactoe/library/GameView.java
rename to samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
index 89f858444..dbd43d95b 100755
--- a/samples/TicTacToeLib/src/com/example/tictactoe/library/GameView.java
+++ b/samples/TicTacToeLib/src/com/example/android/tictactoe/library/GameView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.tictactoe.library;
+package com.example.android.tictactoe.library;
 
 import java.util.Random;
 
diff --git a/samples/TicTacToeMain/AndroidManifest.xml b/samples/TicTacToeMain/AndroidManifest.xml
index ea3ac1138..973d7b766 100755
--- a/samples/TicTacToeMain/AndroidManifest.xml
+++ b/samples/TicTacToeMain/AndroidManifest.xml
@@ -16,7 +16,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.tictactoe"
+      package="com.example.android.tictactoe"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -30,7 +30,7 @@
 
         <!-- This is defined in TicTacToeLib. Right now we need to manually
              copy it here. Eventually it should get merged automatically. -->
-        <activity android:name="com.example.tictactoe.library.GameActivity" />
+        <activity android:name="com.example.android.tictactoe.library.GameActivity" />
 
 
     </application>
diff --git a/samples/TicTacToeMain/src/com/example/tictactoe/MainActivity.java b/samples/TicTacToeMain/src/com/example/android/tictactoe/MainActivity.java
similarity index 91%
rename from samples/TicTacToeMain/src/com/example/tictactoe/MainActivity.java
rename to samples/TicTacToeMain/src/com/example/android/tictactoe/MainActivity.java
index b8d4afeb2..14a90116f 100755
--- a/samples/TicTacToeMain/src/com/example/tictactoe/MainActivity.java
+++ b/samples/TicTacToeMain/src/com/example/android/tictactoe/MainActivity.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.tictactoe;
 
-import com.example.tictactoe.library.GameActivity;
-import com.example.tictactoe.library.GameView.State;
+package com.example.android.tictactoe;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -24,6 +22,9 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 
+import com.example.android.tictactoe.library.GameActivity;
+import com.example.android.tictactoe.library.GameView.State;
+
 public class MainActivity extends Activity {
     /** Called when the activity is first created. */
     @Override