| commit | 5c341c36d6f38beeeed8b0423f865d672ed6bf57 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Sep 26 10:30:01 2012 -0700 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 26 10:30:01 2012 -0700 |
| tree | 3bc803b5ebf77046e3a9ffaec1561ec73f6ba305 | |
| parent | 246817b26431dd17f5f4c0f440a4da97aba1a15b [diff] | |
| parent | ed9952b65288e7ff21d8484fc2fe7f7dcc87c4e6 [diff] |
Merge "Fixed repo sample after changes to manifest merging."
diff --git a/testapps/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java b/testapps/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java index e984b9e..11d7c32 100644 --- a/testapps/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java +++ b/testapps/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
@@ -5,6 +5,8 @@ import android.content.Intent; import android.os.Bundle; +import com.example.android.multiproject.library.ShowPeopleActivity; + public class MainActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) {
diff --git a/testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/PersonView.java b/testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java similarity index 85% rename from testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/PersonView.java rename to testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java index a8f253f..b218532 100644 --- a/testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/PersonView.java +++ b/testapps/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
@@ -1,4 +1,4 @@ -package com.example.android.multiproject; +package com.example.android.multiproject.library; import android.widget.TextView; import android.content.Context;
diff --git a/testapps/repo/library/src/main/java/com/example/android/multiproject/ShowPeopleActivity.java b/testapps/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java similarity index 93% rename from testapps/repo/library/src/main/java/com/example/android/multiproject/ShowPeopleActivity.java rename to testapps/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java index b10f0d3..a3f2195 100644 --- a/testapps/repo/library/src/main/java/com/example/android/multiproject/ShowPeopleActivity.java +++ b/testapps/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
@@ -1,4 +1,4 @@ -package com.example.android.multiproject; +package com.example.android.multiproject.library; import android.app.Activity; import android.os.Bundle;