Commit Graph

5103 Commits

Author SHA1 Message Date
The Android Open Source Project
5b836a44c7 am 9bad20b0: merge from froyo-plus-aosp
Merge commit '9bad20b019424a315c3f9a3d2b0e3a711bb43665'

* commit '9bad20b019424a315c3f9a3d2b0e3a711bb43665':
  Moving SDK howto docs from development.git into sdk.git.
2010-06-25 14:20:57 -07:00
The Android Open Source Project
9bad20b019 merge from froyo-plus-aosp
Change-Id: I1c7b0ce913903088729cce23fa0e8f39c9e8c15d
2010-06-25 09:46:08 -07:00
Bill Napier
e9605aa2a0 Merge "Fix to invalid call to manifest.app_info" 2010-06-25 09:41:03 -07:00
Christian Mehlmauer
3a3e3ab2df Replaced deprecated Contacts Api with ContactsContract
Change-Id: I4816781c7b48b27ec64a63d51db02646c3d6c1a5
2010-06-25 18:39:40 +02:00
Yu Shan Emily Lau
caef9d484f am 7c8c5d91: am 3bacdf93: am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '7c8c5d911c670df2c58bf1ece73e6bc576360696'

* commit '7c8c5d911c670df2c58bf1ece73e6bc576360696':
  Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
2010-06-24 17:16:34 -07:00
Madan Ankapura
39529c673a Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
A better way to construct the activity name should be by getting the substring from the fully qualified classname
itself and not using the PackageInfo.
Credit:Ritu Srivastava

Change-Id: I9ff5a27d828d5d3836bb55101cb947f670ea5941
2010-06-24 15:55:55 -07:00
Yu Shan Emily Lau
7c8c5d911c am 3bacdf93: am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '3bacdf93002237f35530c1e756481db429285a96' into gingerbread-plus-aosp

* commit '3bacdf93002237f35530c1e756481db429285a96':
  Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
2010-06-24 15:43:28 -07:00
Yu Shan Emily Lau
a96f73a683 am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '1a132581a5ce6188989d8522d227392c05cb42f6' into froyo-plus-aosp

* commit '1a132581a5ce6188989d8522d227392c05cb42f6':
  Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
2010-06-24 15:42:29 -07:00
Yu Shan Emily Lau
3bacdf9300 am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '1a132581a5ce6188989d8522d227392c05cb42f6' into gingerbread

* commit '1a132581a5ce6188989d8522d227392c05cb42f6':
  Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
2010-06-24 15:41:10 -07:00
Yu Shan Emily Lau
1a132581a5 Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo 2010-06-24 15:30:29 -07:00
Yu Shan Emily Lau
07aeb8c358 Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Change-Id: I3d98d56128b8a96ba712c7e11280e3ab88a7cc4a
2010-06-24 14:20:16 -07:00
The Android Open Source Project
52cc9b9911 merge from open-source master
Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591
2010-06-24 14:02:21 -07:00
Gilles Debunne
55f4a60aa0 New XmlAdapter sample example.
This sample illustrate the use of the news Xml Adapters definition, as well
as the use on the new XmlDocumentProvider class.

Change-Id: Ie9738b5f0a0f00df2af643890a48573bace19311
2010-06-24 09:44:57 -07:00
Raphael Moll
d63615fa69 Moving SDK howto docs from development.git into sdk.git.
See Change I7827d3f3cc6b8ba96822170949618dc75d879d28 for
the CL that adds them back in sdk.git

Change-Id: I37a5b27875fc3ed6b52202ab8435888d38644ca5
2010-06-23 16:00:58 -07:00
Kenny Root
b606d1bea2 am 60c91105: am 9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e'

* commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e':
  Do not compress resources.arsc in android.jar
2010-06-23 13:56:38 -07:00
Kenny Root
60c9110510 am 9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '9e1400cdae7f3732808120db8b83de7b252340ca' into gingerbread-plus-aosp

* commit '9e1400cdae7f3732808120db8b83de7b252340ca':
  Do not compress resources.arsc in android.jar
2010-06-23 13:54:32 -07:00
Kenny Root
9e1400cdae Do not compress resources.arsc in android.jar
In framework-res.apk and in applications, resources are always stored in
zip files instead of compressed so that they may be accessed via mmap()
instead of needing to decompress them first.

This change makes sure the SDK's android.jar has the same behavior.

Change-Id: Ied881c34dca86ff5b5bd2ccfa4e316ae590ca473
2010-06-23 13:40:41 -07:00
Scott Main
5aac0e7624 am 109bc311: am e660fef5: am 81b9c9d8: docs: fix doc link bug
Merge commit '109bc31187f2394ce711bde6043a478bf9e7c1ca'

* commit '109bc31187f2394ce711bde6043a478bf9e7c1ca':
  docs: fix doc link bug
2010-06-23 12:41:27 -07:00
Yu Shan Emily Lau
79cd62a759 am 762e331c: am 259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '762e331c2f302c508e5d28f22d0e537790458ef5'

* commit '762e331c2f302c508e5d28f22d0e537790458ef5':
  add test def for calculator
2010-06-23 10:32:38 -07:00
Dianne Hackborn
fa199bb673 am 36249f33: am 5468d768: Update native APIs for events.
Merge commit '36249f33c42222167d1fc3e8124a00d49928dea2'

* commit '36249f33c42222167d1fc3e8124a00d49928dea2':
  Update native APIs for events.
2010-06-23 10:32:10 -07:00
Scott Main
109bc31187 am e660fef5: am 81b9c9d8: docs: fix doc link bug
Merge commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d' into gingerbread-plus-aosp

* commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d':
  docs: fix doc link bug
2010-06-22 18:43:35 -07:00
Scott Main
e655ff2ce1 am 81b9c9d8: docs: fix doc link bug
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp

* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
  docs: fix doc link bug
2010-06-22 18:42:23 -07:00
Scott Main
e660fef552 am 81b9c9d8: docs: fix doc link bug
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into gingerbread

* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
  docs: fix doc link bug
2010-06-22 18:41:36 -07:00
Yu Shan Emily Lau
762e331c2f am 259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '259651e2de730b513003cb0c2f966f53b9dffb5e' into gingerbread-plus-aosp

* commit '259651e2de730b513003cb0c2f966f53b9dffb5e':
  add test def for calculator
2010-06-22 11:42:26 -07:00
Yu Shan Emily Lau
259651e2de Merge "add test def for calculator" into gingerbread 2010-06-22 11:41:10 -07:00
Andrew Stadler
443af26a84 Cleanup after bouncycastle moved and common went away
Change-Id: I3be20bb4999d33b5e5f69f4eb00c20429a5d36b3
2010-06-22 11:40:31 -07:00
Dianne Hackborn
36249f33c4 am 5468d768: Update native APIs for events.
Merge commit '5468d768716a4a9de1012067d89908ba4893f9c8' into gingerbread-plus-aosp

* commit '5468d768716a4a9de1012067d89908ba4893f9c8':
  Update native APIs for events.
2010-06-22 11:24:15 -07:00
Scott Main
81b9c9d8ea docs: fix doc link bug
bug: 2788457

Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
2010-06-22 10:38:04 -07:00
Dianne Hackborn
5468d76871 Update native APIs for events.
Copy current native event APIs over; start updating
sample code to use them.

The native activity sample is now much more real, creating
its own worker thread, which now monitors and prints any
incoming input events.

Note that due to the lack of default key handling, pressing
back no longer works!  Will be fixed in a bit.  This code
also needs to be refactored to put the engine part into
a separate source file.

Change-Id: I2ab3e6d9f840b99ec9a05bbc0d2cd9314beb23d7
2010-06-21 18:07:58 -07:00
Konstantin Lopyrev
991a1f530a Fix 2677197: Adding support for minimum number of complex characters to the Device Admin Sample App.
Change-Id: I7570f005ee665adc150e8c4fb92068b4d8dcdbb1
2010-06-21 16:59:31 -07:00
Guang Zhu
cf02f247de add test def for calculator
Change-Id: I2501f0699f6eb286037ed314c30be4818a25c643
2010-06-21 16:55:00 -07:00
Marco Nelissen
f6bf5806b1 Make simulator boot in master.
Change-Id: I13fa4c188645049152cbfcf2139cf21acebaa370
2010-06-21 12:32:29 -07:00
The Android Open Source Project
77cfa732b5 am 29d09a18: merge from froyo-plus-aosp
Merge commit '29d09a18c50a2dd9412ca393f2f5657d3199c414'

* commit '29d09a18c50a2dd9412ca393f2f5657d3199c414':
  remove apkbuilder.jar from the sdk build.
  remove jarutils from the sdk packaging.
2010-06-21 11:02:32 -07:00
The Android Open Source Project
29d09a18c5 merge from froyo-plus-aosp
Change-Id: Icd2fa05c77fd2ec7c878520647e0024bf89b0504
2010-06-21 11:00:40 -07:00
The Android Open Source Project
906d47573b merge from open-source master
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
2010-06-18 11:33:52 -07:00
Andrew Stadler
0d13aede65 Fix classpath to follow frameworks/base/policy changes.
Change-Id: I06cd6592af73ad8852983039a6d238f17eb979a9
2010-06-17 14:47:20 -07:00
Jeff Davidson
c1224d3b35 Fix to invalid call to manifest.app_info
Change-Id: I7bb9f0b10ab814a6fd278d9c2ef1939d5ab9b671
2010-06-17 11:53:49 -07:00
Scott Main
6409710828 update notepad tutorial to change activity title in NoteEdit class
Change-Id: I58e8919dab1b82696d11e5e578419f30b47b0737
2010-06-17 10:04:10 -07:00
Xavier Ducrohet
32b1e17b75 am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'

* commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
  remove apkbuilder.jar from the sdk build.
2010-06-16 19:41:49 -07:00
Xavier Ducrohet
2f8cb6de03 am fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit 'fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9' into gingerbread-plus-aosp

* commit 'fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9':
  remove apkbuilder.jar from the sdk build.
2010-06-16 18:26:09 -07:00
Xavier Ducrohet
fdbc1d7bc1 remove apkbuilder.jar from the sdk build.
Change-Id: I76f979a0d3aa196f25e8a5f2522437e26655a7d0
2010-06-16 18:10:41 -07:00
Xavier Ducrohet
1cabf853fd remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
2010-06-15 18:04:44 -07:00
Xavier Ducrohet
66bdf7ff57 am e389abdc: am 442396be: remove jarutils from the sdk packaging.
Merge commit 'e389abdc29eb2a9d523e64531975dde25a8e9617'

* commit 'e389abdc29eb2a9d523e64531975dde25a8e9617':
  remove jarutils from the sdk packaging.
2010-06-15 16:01:29 -07:00
Xavier Ducrohet
e389abdc29 am 442396be: remove jarutils from the sdk packaging.
Merge commit '442396be27a82850f99d4a891d02b8c95c9c1ef1' into gingerbread-plus-aosp

* commit '442396be27a82850f99d4a891d02b8c95c9c1ef1':
  remove jarutils from the sdk packaging.
2010-06-15 15:36:47 -07:00
Xavier Ducrohet
442396be27 remove jarutils from the sdk packaging.
Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
2010-06-15 15:35:07 -07:00
The Android Open Source Project
e7a4c0910c merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
2010-06-15 15:02:39 -07:00
Xavier Ducrohet
4c22d2bb7d remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
2010-06-15 13:00:13 -07:00
Brett Chabot
b1eb5d2434 resolved conflicts for merge of fa6e5585 to master
Change-Id: I967289246c3472a30f4623581226cbc3054f0b56
2010-06-15 11:18:42 -07:00
Brett Chabot
fa6e5585e3 am 0e968fa2: Merge "Workaround for package-private framework tests in runtest." into gingerbread
Merge commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99' into gingerbread-plus-aosp

* commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99':
  Workaround for package-private framework tests in runtest.
2010-06-15 10:49:09 -07:00
Brett Chabot
0e968fa2ee Merge "Workaround for package-private framework tests in runtest." into gingerbread 2010-06-15 10:46:32 -07:00