Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aff856d0 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity... 

am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo

Merge commit '0dd3a239' into froyo-plus-aosp

* commit '0dd3a239':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
parents e34d31e6 0dd3a239

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -411,6 +411,10 @@ web_docs_sample_code_flags := \ 
		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            resources/samples/SoftKeyboard "Soft Keyboard" \

		-samplecode $(sample_dir)/Spinner  \

		            resources/samples/Spinner "Spinner" \

		-samplecode $(sample_dir)/SpinnerTest \

		            resources/samples/SpinnerTest "SpinnerTest" \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/images/testing/eclipse_new_android_project_complete_callouts.png

0 → 100644
+85.7 KiB
Loading image diff...

docs/html/images/testing/eclipse_new_android_testproject_complete_callouts.png

0 → 100644
+80.6 KiB
Loading image diff...

docs/html/images/testing/hwtest_create_test_class_menu_callouts.png

0 → 100644
+87.1 KiB
Loading image diff...

docs/html/images/testing/hwtest_junit_success.png

0 → 100644
+22.3 KiB
Loading image diff...