Merge "Rename the activity lifecycle sample's directory" into ics-mr1

Browse Source

...

This commit is contained in:

Scott Main

2012-04-19 16:47:27 -07:00

committed by Android (Google) Code Review

parent ba1636e425 d573ba579b

commit ff329d74fc

26 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

samples/training/basic/activity-lifecycle/AndroidManifest.xml → samples/training/basic/ActivityLifecycle/AndroidManifest.xml

0

samples/training/basic/activity-lifecycle/ant.properties → samples/training/basic/ActivityLifecycle/ant.properties

0

samples/training/basic/activity-lifecycle/build.properties → samples/training/basic/ActivityLifecycle/build.properties

0

samples/training/basic/activity-lifecycle/build.xml → samples/training/basic/ActivityLifecycle/build.xml

0

samples/training/basic/activity-lifecycle/default.properties → samples/training/basic/ActivityLifecycle/default.properties

0

samples/training/basic/activity-lifecycle/libs/android-support-v13.jar → samples/training/basic/ActivityLifecycle/libs/android-support-v13.jar

0

samples/training/basic/activity-lifecycle/local.properties → samples/training/basic/ActivityLifecycle/local.properties

0

samples/training/basic/activity-lifecycle/proguard.cfg → samples/training/basic/ActivityLifecycle/proguard.cfg

0

samples/training/basic/activity-lifecycle/project.properties → samples/training/basic/ActivityLifecycle/project.properties

0

samples/training/basic/activity-lifecycle/res/drawable-hdpi/ic_launcher.png → samples/training/basic/ActivityLifecycle/res/drawable-hdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1022 B After Width:  |  Height:  |  Size: 1022 B

0

samples/training/basic/activity-lifecycle/res/drawable-ldpi/ic_launcher.png → samples/training/basic/ActivityLifecycle/res/drawable-ldpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 652 B After Width:  |  Height:  |  Size: 652 B

0

samples/training/basic/activity-lifecycle/res/drawable-mdpi/ic_launcher.png → samples/training/basic/ActivityLifecycle/res/drawable-mdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 797 B After Width:  |  Height:  |  Size: 797 B

0

samples/training/basic/activity-lifecycle/res/drawable-xhdpi/ic_launcher.png → samples/training/basic/ActivityLifecycle/res/drawable-xhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

samples/training/basic/activity-lifecycle/res/layout/activity_a.xml → samples/training/basic/ActivityLifecycle/res/layout/activity_a.xml

0

samples/training/basic/activity-lifecycle/res/layout/activity_b.xml → samples/training/basic/ActivityLifecycle/res/layout/activity_b.xml

0

samples/training/basic/activity-lifecycle/res/layout/activity_c.xml → samples/training/basic/ActivityLifecycle/res/layout/activity_c.xml

0

samples/training/basic/activity-lifecycle/res/layout/activity_dialog.xml → samples/training/basic/ActivityLifecycle/res/layout/activity_dialog.xml

0

samples/training/basic/activity-lifecycle/res/values/colors.xml → samples/training/basic/ActivityLifecycle/res/values/colors.xml

0

samples/training/basic/activity-lifecycle/res/values/dimensions.xml → samples/training/basic/ActivityLifecycle/res/values/dimensions.xml

0

samples/training/basic/activity-lifecycle/res/values/strings.xml → samples/training/basic/ActivityLifecycle/res/values/strings.xml

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityA.java

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityB.java

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityC.java

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/DialogActivity.java

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/StatusTracker.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/StatusTracker.java

0

samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/Utils.java → samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/Utils.java