summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2012-04-04 17:07:19 -0700
committerTrevor Johns <trevorjohns@google.com>2012-04-04 17:21:53 -0700
commita539e4e377cab1785b86af2f0260b63544fb6ff9 (patch)
tree0d11a44b3f9a590f92b4508d9c375033486fc612 /samples
parentdfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0 (diff)
downloadandroid_development-a539e4e377cab1785b86af2f0260b63544fb6ff9.tar.gz
android_development-a539e4e377cab1785b86af2f0260b63544fb6ff9.tar.bz2
android_development-a539e4e377cab1785b86af2f0260b63544fb6ff9.zip
Update activity-lifecycle sample: Use unique package name
Changing the package name for activity-lifecycle sample from com.example.android to com.example.android.lifecycle. Change-Id: I8c17762fde0895408da0b2e1b17b425bcb9e7abb
Diffstat (limited to 'samples')
-rw-r--r--samples/training/basic/activity-lifecycle/AndroidManifest.xml10
-rw-r--r--samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java1
-rw-r--r--samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java1
-rw-r--r--samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java1
-rw-r--r--samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java1
5 files changed, 5 insertions, 9 deletions
diff --git a/samples/training/basic/activity-lifecycle/AndroidManifest.xml b/samples/training/basic/activity-lifecycle/AndroidManifest.xml
index d929179b7..7d3ee1b0e 100644
--- a/samples/training/basic/activity-lifecycle/AndroidManifest.xml
+++ b/samples/training/basic/activity-lifecycle/AndroidManifest.xml
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android"
+ package="com.example.android.lifecycle"
android:versionCode="1"
android:versionName="1.0">
@@ -23,7 +23,7 @@ limitations under the License.
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher">
- <activity android:name=".lifecycle.ActivityA"
+ <activity android:name=".ActivityA"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -31,11 +31,11 @@ limitations under the License.
</intent-filter>
</activity>
- <activity android:name=".lifecycle.ActivityB" />
+ <activity android:name=".ActivityB" />
- <activity android:name=".lifecycle.ActivityC" />
+ <activity android:name=".ActivityC" />
- <activity android:name=".lifecycle.DialogActivity"
+ <activity android:name=".DialogActivity"
android:theme="@android:style/Theme.Dialog">
</activity>
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java
index daf46ea7c..092e6db8b 100644
--- a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java
+++ b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
-import com.example.android.R;
import com.example.android.lifecycle.util.StatusTracker;
import com.example.android.lifecycle.util.Utils;
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java
index 92d4c2cda..c5d0414ed 100644
--- a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java
+++ b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
-import com.example.android.R;
import com.example.android.lifecycle.util.StatusTracker;
import com.example.android.lifecycle.util.Utils;
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java
index 590671b94..d9f5bdcee 100644
--- a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java
+++ b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
-import com.example.android.R;
import com.example.android.lifecycle.util.StatusTracker;
import com.example.android.lifecycle.util.Utils;
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java
index 7929b4458..1a5042298 100644
--- a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java
+++ b/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java
@@ -20,7 +20,6 @@ import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.Window;
-import com.example.android.R;
public class DialogActivity extends Activity {
@Override