OSDN Git Service
Ying Wang [Thu, 15 Apr 2010 03:58:40 +0000 (20:58 -0700)]
am
84086578: Add timestamp to monkey log
Merge commit '
84086578bb07eb65c141f5cba0c5e31a12d44c17' into froyo-plus-aosp
* commit '
84086578bb07eb65c141f5cba0c5e31a12d44c17':
Add timestamp to monkey log
Ying Wang [Thu, 15 Apr 2010 01:48:02 +0000 (18:48 -0700)]
Add timestamp to monkey log
Change-Id: Ia477aca8b00d06049621d848f5792c291e3db040
The Android Open Source Project [Mon, 12 Apr 2010 20:11:26 +0000 (13:11 -0700)]
merge from open-source master
Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf
Dirk Dougherty [Sat, 10 Apr 2010 18:38:00 +0000 (11:38 -0700)]
am
4a541438: Merge "SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version." into froyo
Merge commit '
4a5414381b1abe693101f18a4d483ed5ddff55ec' into froyo-plus-aosp
* commit '
4a5414381b1abe693101f18a4d483ed5ddff55ec':
SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version.
Dirk Dougherty [Sat, 10 Apr 2010 02:00:07 +0000 (19:00 -0700)]
Merge "SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version." into froyo
Dirk Dougherty [Sat, 10 Apr 2010 01:45:51 +0000 (18:45 -0700)]
SDK doc change: update gae request handler to use new intl/nn handling behaviors. Now always honors any locally set lang cookie and redirects unsupported url langs to en version.
Change-Id: Id778ba96936c6ed5c3c5ec6c76e476f1fa7036bf
Xavier Ducrohet [Fri, 9 Apr 2010 21:11:16 +0000 (14:11 -0700)]
Merge "Fix SDK build by packaging the new Ant rules files."
Xavier Ducrohet [Fri, 9 Apr 2010 21:00:34 +0000 (14:00 -0700)]
Fix SDK build by packaging the new Ant rules files.
Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818
The Android Open Source Project [Fri, 9 Apr 2010 20:52:58 +0000 (13:52 -0700)]
Delete NDK, moved into its own project
Change-Id: Ia51e76d7a9995fb43a096ebbdfa908f84d9da59c
Xavier Ducrohet [Fri, 9 Apr 2010 20:14:58 +0000 (13:14 -0700)]
Update SDK build file to package the correct version for groovy.
Change-Id: I0e81a9941693acc0f29933aa15bb7d4e7689bf51
Brett Chabot [Thu, 8 Apr 2010 19:09:48 +0000 (12:09 -0700)]
am
3804ab42: Change VoiceRecognitionService sample to use API 8 instead of froyo.
Merge commit '
3804ab420be1f7f3c49cd91b695800209db6a346' into froyo-plus-aosp
* commit '
3804ab420be1f7f3c49cd91b695800209db6a346':
Change VoiceRecognitionService sample to use API 8 instead of froyo.
Brett Chabot [Thu, 8 Apr 2010 18:32:08 +0000 (11:32 -0700)]
Change VoiceRecognitionService sample to use API 8 instead of froyo.
Bug
2581621
Change-Id: Idab0afe6e6c85edba9d2af3d9d5961fe77d1ea14
Christopher Tate [Wed, 7 Apr 2010 21:22:17 +0000 (14:22 -0700)]
am
3356ba35: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
3356ba35fa7632fc801210f46d3ec10d1b6cf6a1' into froyo-plus-aosp
* commit '
3356ba35fa7632fc801210f46d3ec10d1b6cf6a1':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:19:40 +0000 (14:19 -0700)]
Merge "Add Backup/Restore sample to the SDK docs" into froyo
Christopher Tate [Wed, 7 Apr 2010 18:16:48 +0000 (11:16 -0700)]
Add Backup/Restore sample to the SDK docs
Part of bug #
2545514
Change-Id: I9085ebfdce3552ddab602eec8d40de67b219a834
Ray Chen [Wed, 7 Apr 2010 19:09:39 +0000 (12:09 -0700)]
am
f617797e: Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo
Merge commit '
f617797e88f958a09f8262d0b362bd74d129f575' into froyo-plus-aosp
* commit '
f617797e88f958a09f8262d0b362bd74d129f575':
API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener.
Ray Chen [Wed, 7 Apr 2010 19:06:03 +0000 (12:06 -0700)]
Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo
Christopher Tate [Wed, 7 Apr 2010 18:16:43 +0000 (11:16 -0700)]
am
406ed04d: Merge "Backup/Restore sample application" into froyo
Merge commit '
406ed04d5a6b37dd9ed439ea954a1f23ac675138' into froyo-plus-aosp
* commit '
406ed04d5a6b37dd9ed439ea954a1f23ac675138':
Backup/Restore sample application
Christopher Tate [Wed, 7 Apr 2010 18:12:24 +0000 (11:12 -0700)]
Merge "Backup/Restore sample application" into froyo
Ray Chen [Tue, 6 Apr 2010 22:16:13 +0000 (15:16 -0700)]
API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener.
Change-Id: I1386394dbccda4c01e50d89b8fdeca97ee65a29f
Raphael [Tue, 6 Apr 2010 21:36:31 +0000 (14:36 -0700)]
am
39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo
Merge commit '
39637a37fb0074ad0d86c9f30aab5a0cae9ed26c' into froyo-plus-aosp
* commit '
39637a37fb0074ad0d86c9f30aab5a0cae9ed26c':
Project-lib sample: define lib activity.
Switch from codename Froyo to API 8.
Raphael [Tue, 6 Apr 2010 21:34:21 +0000 (14:34 -0700)]
Merge changes I3641b7c0,Ibdd1dbc8 into froyo
* changes:
Project-lib sample: define lib activity.
Switch from codename Froyo to API 8.
Christopher Tate [Mon, 5 Apr 2010 18:06:35 +0000 (11:06 -0700)]
Backup/Restore sample application
A very simple application: one activity, with a few bits of persistent data that
are updated live by the activity. To that are added a few alternative agent
implementations, to illustrate various approaches and tradeoffs when implementing
a backup/restore agent. In particular, there are example agents that do everything
"by hand," either record-by-record or by directly backing up the app's entire
persistent data file; plus an example agent that illustrates how very easy it
is to implement the latter using the OS-provided helpers.
Part of bug #
2545514
Change-Id: Iaca33a5113406360c23d6e2e59eb012f9f1e9400
Xavier Ducrohet [Tue, 6 Apr 2010 21:16:01 +0000 (14:16 -0700)]
am
254f0e9b: Update SDK component source.properties.
Merge commit '
254f0e9bf7595d66b4b7e834636cf7646b972608' into froyo-plus-aosp
* commit '
254f0e9bf7595d66b4b7e834636cf7646b972608':
Update SDK component source.properties.
Raphael [Tue, 6 Apr 2010 20:10:57 +0000 (13:10 -0700)]
Project-lib sample: define lib activity.
This was removed by mistake. I meant to add explanations.
Change-Id: I3641b7c01a1425ab5430695ac83ca71c9fc644d8
Raphael [Tue, 6 Apr 2010 20:09:44 +0000 (13:09 -0700)]
Switch from codename Froyo to API 8.
Change-Id: Ibdd1dbc80e5e7d9856a90ff45a3b148a5af72581
Xavier Ducrohet [Tue, 6 Apr 2010 20:09:37 +0000 (13:09 -0700)]
Update SDK component source.properties.
Change-Id: I2688117f63fe4d9b2d7f8ce220d907fc7ea95ba4
Brett Chabot [Mon, 5 Apr 2010 23:51:13 +0000 (16:51 -0700)]
am
79a612b2: Remove com.android.quicksearchbox.tests from continuous.
Merge commit '
79a612b2ad76cee2d8e11dcf87b0ce45b0056785' into froyo-plus-aosp
* commit '
79a612b2ad76cee2d8e11dcf87b0ce45b0056785':
Remove com.android.quicksearchbox.tests from continuous.
Brett Chabot [Mon, 5 Apr 2010 23:37:59 +0000 (16:37 -0700)]
Remove com.android.quicksearchbox.tests from continuous.
Bug
2562721
Change-Id: Ic8c582cb1f18f8e733c6bd2ced146066d50ca47e
Raphael [Mon, 5 Apr 2010 23:14:11 +0000 (16:14 -0700)]
am
1fd241b3: Merge "Project-lib sample: externalize strings in lib." into froyo
Merge commit '
1fd241b381c61e1068625de0a22bd7d9bb6257b8' into froyo-plus-aosp
* commit '
1fd241b381c61e1068625de0a22bd7d9bb6257b8':
Project-lib sample: externalize strings in lib.
Raphael [Mon, 5 Apr 2010 23:14:08 +0000 (16:14 -0700)]
am
4ce5771c: Merge "Project-lib sample: set namespace to com.example.android" into froyo
Merge commit '
4ce5771ce7460bb7d29b4151512d1a7811499dfe' into froyo-plus-aosp
* commit '
4ce5771ce7460bb7d29b4151512d1a7811499dfe':
Project-lib sample: set namespace to com.example.android
Raphael [Mon, 5 Apr 2010 23:14:06 +0000 (16:14 -0700)]
am
c45224b4: Merge "Implementation of the tic-tac-toe sample." into froyo
Merge commit '
c45224b4252e48f68239e4610811ac1afe41ad71' into froyo-plus-aosp
* commit '
c45224b4252e48f68239e4610811ac1afe41ad71':
Implementation of the tic-tac-toe sample.
Raphael [Mon, 5 Apr 2010 23:14:03 +0000 (16:14 -0700)]
am
6cb5d6a4: Merge "Skeleton for tic-tac-toe sample." into froyo
Merge commit '
6cb5d6a40b01808a5a09670910790ce01c527eda' into froyo-plus-aosp
* commit '
6cb5d6a40b01808a5a09670910790ce01c527eda':
Skeleton for tic-tac-toe sample.
Raphael [Mon, 5 Apr 2010 23:07:20 +0000 (16:07 -0700)]
Merge "Project-lib sample: externalize strings in lib." into froyo
Raphael [Mon, 5 Apr 2010 23:07:11 +0000 (16:07 -0700)]
Merge "Project-lib sample: set namespace to com.example.android" into froyo
Raphael [Mon, 5 Apr 2010 23:07:02 +0000 (16:07 -0700)]
Merge "Implementation of the tic-tac-toe sample." into froyo
Raphael [Mon, 5 Apr 2010 23:06:51 +0000 (16:06 -0700)]
Merge "Skeleton for tic-tac-toe sample." into froyo
Raphael [Mon, 5 Apr 2010 21:54:18 +0000 (14:54 -0700)]
Project-lib sample: externalize strings in lib.
Change-Id: I5fff488ab96f1e28942143330c69370f2009e691
Raphael [Mon, 5 Apr 2010 21:25:50 +0000 (14:25 -0700)]
Project-lib sample: set namespace to com.example.android
This is a pure namespace refactoring change.
Change-Id: I33f5998f876cdc9893d8d45983422ca0e331b3c4
Raphael [Sat, 3 Apr 2010 05:05:14 +0000 (22:05 -0700)]
Implementation of the tic-tac-toe sample.
Added some README.txt
Change-Id: Ie2703ffdfdeba773d0fd27153ec0cdb806b2e2dc
Brett Chabot [Mon, 5 Apr 2010 19:49:15 +0000 (12:49 -0700)]
am
8c63b97f: Rename framework-common testdef to android-common.
Merge commit '
8c63b97f83ac1ac687579286437e0f55c3b267c1' into froyo-plus-aosp
* commit '
8c63b97f83ac1ac687579286437e0f55c3b267c1':
Rename framework-common testdef to android-common.
Brett Chabot [Mon, 5 Apr 2010 19:19:17 +0000 (12:19 -0700)]
Rename framework-common testdef to android-common.
Change-Id: I71717dd874cd3ed82415d110c745dc68e0922838
Raphael [Fri, 2 Apr 2010 06:39:30 +0000 (23:39 -0700)]
Skeleton for tic-tac-toe sample.
Change-Id: I41e7013d469cb2eba9f475aa0a94c4630cacbb64
Brett Chabot [Fri, 2 Apr 2010 17:28:33 +0000 (10:28 -0700)]
am
452de9c9: Merge "More test_defs cleanup." into froyo
Merge commit '
452de9c984b7a21a2208834260a9bb6ce1b0d1a2' into froyo-plus-aosp
* commit '
452de9c984b7a21a2208834260a9bb6ce1b0d1a2':
More test_defs cleanup.
Brett Chabot [Fri, 2 Apr 2010 17:24:15 +0000 (10:24 -0700)]
Merge "More test_defs cleanup." into froyo
Brett Chabot [Fri, 2 Apr 2010 15:50:02 +0000 (08:50 -0700)]
More test_defs cleanup.
Remove obsolete defs, fix browser def, and add framework common tests to
continuous.
Bug
2562721
Change-Id: I41457db7ad6fb460a61429ba686b778d9cf1fa35
Brett Chabot [Fri, 2 Apr 2010 04:49:57 +0000 (21:49 -0700)]
am
d6aae2e8: Merge "Cleanup framework test defs." into froyo
Merge commit '
d6aae2e84b337bb887cf5fcc21b613a4d4151eb6' into froyo-plus-aosp
* commit '
d6aae2e84b337bb887cf5fcc21b613a4d4151eb6':
Cleanup framework test defs.
Brett Chabot [Fri, 2 Apr 2010 04:45:59 +0000 (21:45 -0700)]
Merge "Cleanup framework test defs." into froyo
Brett Chabot [Fri, 2 Apr 2010 01:38:31 +0000 (18:38 -0700)]
Cleanup framework test defs.
Remove obsolete framework test definitions. Reorganize to keep all the framework
tests together.
Bug
2562721
Change-Id: Ic96d52dc081eb28f5354954d3d111a77dc1d8db9
Ying Wang [Fri, 2 Apr 2010 00:42:53 +0000 (17:42 -0700)]
am
a1c8fb11: Merge "Move potentially blocking operation out of the activity controller." into froyo
Merge commit '
a1c8fb11b2008d57f78e4ae35ec87203bda9b8d4' into froyo-plus-aosp
* commit '
a1c8fb11b2008d57f78e4ae35ec87203bda9b8d4':
Move potentially blocking operation out of the activity controller.
Dan Egnor [Fri, 2 Apr 2010 00:42:51 +0000 (17:42 -0700)]
am
112ffc76: Remove BugReportSender, which has a happy new home in packages/experimental
Merge commit '
112ffc7662113c68b77f97c03a4a79f640d5eca7' into froyo-plus-aosp
* commit '
112ffc7662113c68b77f97c03a4a79f640d5eca7':
Remove BugReportSender, which has a happy new home in packages/experimental
Ying Wang [Fri, 2 Apr 2010 00:07:08 +0000 (17:07 -0700)]
Merge "Move potentially blocking operation out of the activity controller." into froyo
Dan Egnor [Thu, 1 Apr 2010 23:39:31 +0000 (16:39 -0700)]
Remove BugReportSender, which has a happy new home in packages/experimental
Change-Id: I97628264f3249c86d83cded73daf3b1cc291e051
Ying Wang [Thu, 1 Apr 2010 21:12:25 +0000 (14:12 -0700)]
Move potentially blocking operation out of the activity controller.
http://b/viewIssue?id=
2497953
before this CL, call to reportProcRank() in the controller waited for the
procrank process to finish, which potentially would block the activity
manager and cause deadlock between the activity manager and the window manager.
Change-Id: Ie5a6aae7c8dbe43ac725abdb04f2426f54dd6740
The Android Open Source Project [Wed, 31 Mar 2010 23:30:10 +0000 (16:30 -0700)]
merge from open-source master
Change-Id: I9bfbf5c98f00a0ec6abb2ad389b5f4d138458441
Brett Chabot [Wed, 31 Mar 2010 22:19:16 +0000 (15:19 -0700)]
Merge "Add cts hardware tests to continuous test." into froyo
Brett Chabot [Wed, 31 Mar 2010 02:46:27 +0000 (19:46 -0700)]
Add cts hardware tests to continuous test.
Bug
2557864
Change-Id: I5bf6eb840f180e61e067456b9acfc66d0a454754
Andrew Stadler [Wed, 31 Mar 2010 01:17:18 +0000 (18:17 -0700)]
Merge "More .classpath cleanup" into froyo
Romain Guy [Wed, 31 Mar 2010 00:05:56 +0000 (17:05 -0700)]
Merge "Update Layout Animations samples to take the display's density into account." into froyo
Romain Guy [Wed, 31 Mar 2010 00:05:23 +0000 (17:05 -0700)]
Update Layout Animations samples to take the display's density into account.
Change-Id: I1a6768a36879ad0909a557c17142c9294e20dcbb
Xavier Ducrohet [Tue, 30 Mar 2010 23:55:07 +0000 (16:55 -0700)]
Merge "Make chinese IME not default to the SDK images." into froyo
Andrew Stadler [Tue, 30 Mar 2010 23:34:24 +0000 (16:34 -0700)]
More .classpath cleanup
* launcher -> launcher2
* add AccountsAndSyncSettings
* add BlueTooth
* add CertInstaller
Change-Id: I0f36a479a829df4d69f34619d760b72a5c653498
Kenny Root [Tue, 30 Mar 2010 22:06:57 +0000 (15:06 -0700)]
Merge "Import revised translations" into froyo
Jim Miller [Tue, 30 Mar 2010 20:51:57 +0000 (13:51 -0700)]
Merge "Fix
2527411: Extend sample DPM app to test setMaximumTimeToLock()" into froyo
Raphael [Tue, 30 Mar 2010 20:49:51 +0000 (13:49 -0700)]
Merge "Update the docs explaining how to build an SDK." into froyo
Xavier Ducrohet [Tue, 30 Mar 2010 18:39:25 +0000 (11:39 -0700)]
Make chinese IME not default to the SDK images.
Bug:
2538234
Change-Id: I40b81a3f325e166e011b313134d95bfcf27d4c8b
The Android Open Source Project [Tue, 30 Mar 2010 18:15:02 +0000 (11:15 -0700)]
merge from open-source master
Change-Id: I7ef151320d924b2b258163d8aabf5eeebffecd39
Raphael [Tue, 30 Mar 2010 18:10:06 +0000 (11:10 -0700)]
Update the docs explaining how to build an SDK.
Change-Id: Ib01ad69119152d10cc19ed6e2188621782ecc903
Jean-Michel Trivi [Tue, 30 Mar 2010 17:05:12 +0000 (10:05 -0700)]
Fix bug
2553592 API REVIEW: android.speech
Change 2 of 4
Notes from API Council review:
Rename RecognitionManager to SpeechRecognizer
Change-Id: Ib1245eb9b816605728fb75c77c486ee5ee0e76c6
Kenny Root [Tue, 30 Mar 2010 16:14:36 +0000 (09:14 -0700)]
Import revised translations
Change-Id: I8450ad100b304fb1f697bb1e678ed049cb122bfa
Jim Miller [Tue, 30 Mar 2010 03:22:06 +0000 (20:22 -0700)]
Fix
2527411: Extend sample DPM app to test setMaximumTimeToLock()
Change-Id: I1a0ff93a27d7d27b66acbacf953eb0984e85e4cf
David 'Digit' Turner [Mon, 29 Mar 2010 21:36:26 +0000 (14:36 -0700)]
Use the 'master' branch to download toolchain sources by default.
The 'eclair' branch cannot be built with the current version of build-toolchain.sh
(More precisely, gdbserver link fails without a patch that is in master but not eclair).
Change-Id: Ib7d4f058d88afbfce6fb22fe1c5b6f08925c9ae3
David 'Digit' Turner [Sat, 27 Mar 2010 01:10:33 +0000 (18:10 -0700)]
build-toolchain.sh: fix the --force-build option
Change-Id: Ia171eff5bc4c352b1d9c646f133c69a77ff6681a
David 'Digit' Turner [Sat, 27 Mar 2010 00:48:46 +0000 (17:48 -0700)]
Allow toolchain source patching in build-toolchain.sh
This is going to make patching/debugging the toolchain sources
a lot easier.
Change-Id: I54f2fcb42465f9f5b1f3735bda1ce9d43eb96a64
Andrew Stadler [Fri, 26 Mar 2010 20:50:28 +0000 (13:50 -0700)]
Cleanup .classpath for eclipse
Change-Id: Ia102189d71d4fe41969df9c122e94dbbd93557f7
Permanent: Remove mmms-common_intermediates (stale - should have been
removed a while ago)
Temporary: Remove Launcher2 & Music (which cause problems due to
overlapping java package names vs. R files)
Bruce Beare [Wed, 10 Mar 2010 23:37:03 +0000 (15:37 -0800)]
NDK can now build JNI code for IA
Change-Id: I5c03c2680663a4fefc4b22524088a3489132e74f
David Turner [Fri, 26 Mar 2010 20:11:06 +0000 (13:11 -0700)]
Merge "Port NDK build tools to IA"
Dan Morrill [Thu, 25 Mar 2010 22:44:04 +0000 (15:44 -0700)]
Merge "Fixing the PDK build. A file PDK slurps in was moved."
Andrew Stadler [Thu, 25 Mar 2010 22:15:03 +0000 (15:15 -0700)]
Merge "Add guava javalib.jar to eclipse classpath."
Andrew Stadler [Thu, 25 Mar 2010 22:14:10 +0000 (15:14 -0700)]
Add guava javalib.jar to eclipse classpath.
Change-Id: I769db0fa9001a51128a3a20b83cf4a85a2f5c7ce
Dan Morrill [Thu, 25 Mar 2010 21:33:53 +0000 (14:33 -0700)]
Fixing the PDK build. A file PDK slurps in was moved.
Change-Id: I59025bc6d8485ff78ad626fff23ca96ed9de8beb
Fred Quintana [Thu, 25 Mar 2010 20:46:39 +0000 (13:46 -0700)]
Merge "need to save the mLongPressedAccount in the instance data"
Fred Quintana [Thu, 25 Mar 2010 17:47:35 +0000 (10:47 -0700)]
need to save the mLongPressedAccount in the instance data
Change-Id: I10458dcc4c539efa64b620ba998b09c14cead28e
http://b/issue?id=
2527346
Bruce Beare [Thu, 11 Mar 2010 19:14:29 +0000 (11:14 -0800)]
Port NDK build tools to IA
Change-Id: I4788cafb998b79234e7fb16661bb225680d5566c
Jean-Baptiste Queru [Wed, 24 Mar 2010 16:22:53 +0000 (09:22 -0700)]
Delete NDK.
It is being moved to a standalone project.
Change-Id: If863753b9bf10ec2b7351fd39eccf28a989102f7
Swarna Kumar [Mon, 22 Mar 2010 22:38:22 +0000 (15:38 -0700)]
Added coverage target for Contacts and Calendar Provider
Change-Id: I0066451fa4deaee50f51d14c969580ed9626a4a4
Dianne Hackborn [Tue, 23 Mar 2010 00:02:46 +0000 (17:02 -0700)]
Add new quality constant.
Change-Id: I386438485a921ec94ed1047936ca182c04bce410
The Android Open Source Project [Mon, 22 Mar 2010 22:55:11 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ia641d105e05982e3a3c85c7b82a70fe1fa664f1a
Jean-Baptiste Queru [Mon, 22 Mar 2010 18:00:35 +0000 (11:00 -0700)]
An APN list with a few relevant carriers.
This comes from the open-source vendor/aosp, which in
turn came from the ADP1 configuration.
Bug:
2533998
Change-Id: I83f0884a15e43e1a3542df8939e84253adfb7cd2
The Android Open Source Project [Fri, 19 Mar 2010 23:36:04 +0000 (16:36 -0700)]
merge from open-source master
Change-Id: I4489db828e47c7c1987cd5cb768009eeb0a124b7
Brett Chabot [Fri, 19 Mar 2010 18:39:06 +0000 (11:39 -0700)]
Merge "Remove use of deprecated API from test sample code."
David 'Digit' Turner [Fri, 19 Mar 2010 18:25:48 +0000 (11:25 -0700)]
Merge "Add missing headers to the x86 android-5 headers (GLES/GLES2/log)"
Brett Chabot [Fri, 19 Mar 2010 01:47:53 +0000 (18:47 -0700)]
Remove use of deprecated API from test sample code.
Modify tests sample code to use ActivityInstrumentationTestCase2 and its new
constructor.
Change-Id: Idf927b6641c8dfb4aede8cb2bba45de29320bcf5
David 'Digit' Turner [Fri, 19 Mar 2010 01:00:31 +0000 (18:00 -0700)]
Remove problematic headers from x86 android-5 headers.
These files have the same case-insensitive name, and this creates problems
when used on Windows + Cygwin.
Change-Id: I911906c209ad9fca8752ba4cdc9c65abdd0bd4a9
David 'Digit' Turner [Fri, 19 Mar 2010 00:45:15 +0000 (17:45 -0700)]
Add missing headers to the x86 android-5 headers (GLES/GLES2/log)
Change-Id: I0e066a1256d6a23b65672327c0cfcf67a0f03f1b
Xavier Ducrohet [Thu, 18 Mar 2010 20:38:52 +0000 (13:38 -0700)]
Package the new ant rules file in the SDK.
Change-Id: Ic4db70e75b7a747c86635d9f28cfb98537c0e9a1
David Turner [Wed, 17 Mar 2010 21:30:53 +0000 (14:30 -0700)]
Merge "android-5 platform files for IA"
Fred Quintana [Tue, 16 Mar 2010 23:27:03 +0000 (16:27 -0700)]
fix runtest for unqualified Instrumentation class names
Change-Id: I0dcc9918b0bde568219d9085e8bbbc4cbba2b552
http://b/issue?id=
2472406
Fred Quintana [Mon, 8 Mar 2010 21:13:53 +0000 (13:13 -0800)]
- change the accounts list to include the account type
- removed the list of account types from the top
- changed the context menu to use the actual account type, not
the one selected in the spinner
- add the clear password option to the context menu
Change-Id: Icd509ed3f3da889f48b064cf524345e0121899fc
Bart Sears [Mon, 15 Mar 2010 22:52:54 +0000 (15:52 -0700)]
Put the test for the new API back in now that the requestCenterFitZoom
API has been put back in.
Revert "Revert "Add a test for the new requestCenterFitZoom api.""
This reverts commit
103e5768937c748adb06dd70b3f301775168c0d5.