Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd'
* commit 'd30605200b8b0f10e4740a9d7266d240023e69cd':
enable additional cdma sms fields and user data encodings
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
- all new public apis are @hidden; they will still get reviewed by api council once we're in git
- other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
to the contacts provider that was reviewed by jham
Automated import of CL 147564
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
squashed commit of the following:
commit e2c2d1c09475ce2e319b935fb5627c82a7693a9b
Author: Guang Zhu <guangzhu@google.com>
Date: Mon Apr 20 13:33:08 2009 -0700
modify wait mechanism so that it checks whether activity has already finished or not first
This reverts commit deb6e8792dd563916724bbc127a6fe16ffe81647.
commit deb6e8792dd563916724bbc127a6fe16ffe81647
Author: Guang Zhu <guangzhu@google.com>
Date: Mon Apr 20 10:58:52 2009 -0700
changed callback mechanism in TestShellActivity to use condition
* changes:
update onCreate method to work around InstrumentationTestRunner limitation.
Removing unused StreamPipe class, also stripping some white spaces
* Update the way that run_page_cycler.py detectes instrumentation failures. * Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
TODO and long comment about the situation.
Original author: danfuzz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146178
1) Lab machines can run layout tests without having build environment setup
2) We could have different set of pass/fail results per branch
Also added a simple python script which runs run_layout_tests.py
Original author: sridharg
Merged from: //branches/cupcake/...
Automated import of CL 143779
1) Lab machines can run layout tests without having build environment setup
2) We could have different set of pass/fail results per branch
Also added a simple python script which runs run_layout_tests.py
Original author: sridharg
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143801
(and add a test that helped me debug it)
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143279
