Commit Graph

3973 Commits

Author SHA1 Message Date
Raphael
8326752bf6 am b3c0d6a1: am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo 2010-04-06 14:50:02 -07:00
Raphael
b3c0d6a1d3 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.
2010-04-06 14:36:31 -07:00
Raphael
39637a37fb Merge changes I3641b7c0,Ibdd1dbc8 into froyo
* changes:
  Project-lib sample: define lib activity.
  Switch from codename Froyo to API 8.
2010-04-06 14:34:21 -07:00
Xavier Ducrohet
a8c08356b2 am 7546e9ed: am 254f0e9b: Update SDK component source.properties. 2010-04-06 14:30:17 -07:00
Xavier Ducrohet
7546e9ed66 am 254f0e9b: Update SDK component source.properties.
Merge commit '254f0e9bf7595d66b4b7e834636cf7646b972608' into froyo-plus-aosp

* commit '254f0e9bf7595d66b4b7e834636cf7646b972608':
  Update SDK component source.properties.
2010-04-06 14:16:01 -07:00
Raphael
7dd0976b04 Project-lib sample: define lib activity.
This was removed by mistake. I meant to add explanations.

Change-Id: I3641b7c01a1425ab5430695ac83ca71c9fc644d8
2010-04-06 13:10:57 -07:00
Raphael
edabb7bfeb Switch from codename Froyo to API 8.
Change-Id: Ibdd1dbc80e5e7d9856a90ff45a3b148a5af72581
2010-04-06 13:09:44 -07:00
Xavier Ducrohet
254f0e9bf7 Update SDK component source.properties.
Change-Id: I2688117f63fe4d9b2d7f8ce220d907fc7ea95ba4
2010-04-06 13:09:37 -07:00
Brett Chabot
729f6a0ae7 am 78566df7: am 79a612b2: Remove com.android.quicksearchbox.tests from continuous. 2010-04-05 17:08:18 -07:00
Brett Chabot
78566df7e8 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.
2010-04-05 16:51:13 -07:00
Brett Chabot
79a612b2ad Remove com.android.quicksearchbox.tests from continuous.
Bug 2562721

Change-Id: Ic8c582cb1f18f8e733c6bd2ced146066d50ca47e
2010-04-05 16:37:59 -07:00
Raphael
6f4089ed44 am 86c178a8: am 1fd241b3: Merge "Project-lib sample: externalize strings in lib." into froyo 2010-04-05 16:36:29 -07:00
Raphael
9563105751 am a60cf6db: am 4ce5771c: Merge "Project-lib sample: set namespace to com.example.android" into froyo 2010-04-05 16:36:26 -07:00
Raphael
7baf24a129 am 1452e936: am c45224b4: Merge "Implementation of the tic-tac-toe sample." into froyo 2010-04-05 16:36:24 -07:00
Raphael
0ac40314e0 am 6c80d5e5: am 6cb5d6a4: Merge "Skeleton for tic-tac-toe sample." into froyo 2010-04-05 16:36:21 -07:00
Raphael
86c178a835 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.
2010-04-05 16:14:11 -07:00
Raphael
a60cf6db08 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
2010-04-05 16:14:08 -07:00
Raphael
1452e9364a 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.
2010-04-05 16:14:06 -07:00
Raphael
6c80d5e586 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.
2010-04-05 16:14:03 -07:00
Raphael
1fd241b381 Merge "Project-lib sample: externalize strings in lib." into froyo 2010-04-05 16:07:20 -07:00
Raphael
4ce5771ce7 Merge "Project-lib sample: set namespace to com.example.android" into froyo 2010-04-05 16:07:11 -07:00
Raphael
c45224b425 Merge "Implementation of the tic-tac-toe sample." into froyo 2010-04-05 16:07:02 -07:00
Raphael
6cb5d6a40b Merge "Skeleton for tic-tac-toe sample." into froyo 2010-04-05 16:06:51 -07:00
Raphael
546d7e8956 Project-lib sample: externalize strings in lib.
Change-Id: I5fff488ab96f1e28942143330c69370f2009e691
2010-04-05 14:54:18 -07:00
Raphael
bbfd2ed1c2 Project-lib sample: set namespace to com.example.android
This is a pure namespace refactoring change.

Change-Id: I33f5998f876cdc9893d8d45983422ca0e331b3c4
2010-04-05 14:25:50 -07:00
Raphael
b8a884fbab Implementation of the tic-tac-toe sample.
Added some README.txt

Change-Id: Ie2703ffdfdeba773d0fd27153ec0cdb806b2e2dc
2010-04-05 14:19:33 -07:00
Brett Chabot
c125ef209b am d71605b0: am 8c63b97f: Rename framework-common testdef to android-common. 2010-04-05 13:07:39 -07:00
Brett Chabot
d71605b033 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.
2010-04-05 12:49:15 -07:00
Brett Chabot
8c63b97f83 Rename framework-common testdef to android-common.
Change-Id: I71717dd874cd3ed82415d110c745dc68e0922838
2010-04-05 12:19:17 -07:00
Raphael
718a35143d Skeleton for tic-tac-toe sample.
Change-Id: I41e7013d469cb2eba9f475aa0a94c4630cacbb64
2010-04-02 22:05:53 -07:00
Rajni Arora Batra
6994e5540c Making browser unit tests as continuous (as part of checking incremental code coverage). Right now we have about 18% of Browser code coverage.
Change-Id: I7bc47286fc6648c447f86eb1acfd7e47d5246d53
2010-04-02 17:55:52 -07:00
Brett Chabot
ca8ef3f722 am 53d3371b: am 452de9c9: Merge "More test_defs cleanup." into froyo 2010-04-02 10:46:09 -07:00
Brett Chabot
53d3371bd4 am 452de9c9: Merge "More test_defs cleanup." into froyo
Merge commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2' into froyo-plus-aosp

* commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2':
  More test_defs cleanup.
2010-04-02 10:28:33 -07:00
Brett Chabot
452de9c984 Merge "More test_defs cleanup." into froyo 2010-04-02 10:24:15 -07:00
Brett Chabot
f692a04c71 More test_defs cleanup.
Remove obsolete defs, fix browser def, and add framework common tests to
continuous.

Bug 2562721

Change-Id: I41457db7ad6fb460a61429ba686b778d9cf1fa35
2010-04-02 08:50:02 -07:00
Brett Chabot
e4a18b9ac6 am 1e1b24ba: am d6aae2e8: Merge "Cleanup framework test defs." into froyo 2010-04-01 23:49:03 -07:00
Ying Wang
a174b7b506 am e7f73ba1: am a1c8fb11: Merge "Move potentially blocking operation out of the activity controller." into froyo 2010-04-01 23:47:39 -07:00
Brett Chabot
1e1b24bad8 am d6aae2e8: Merge "Cleanup framework test defs." into froyo
Merge commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6' into froyo-plus-aosp

* commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6':
  Cleanup framework test defs.
2010-04-01 21:49:57 -07:00
Brett Chabot
d6aae2e84b Merge "Cleanup framework test defs." into froyo 2010-04-01 21:45:59 -07:00
Dan Egnor
ecfd8e7ba0 resolved conflicts for merge of 51823db5 to master
Change-Id: Ic7d158747597d4049b29e9c6281bdab8bf345552
2010-04-01 20:51:17 -07:00
Brett Chabot
a6f3b0ae75 Cleanup framework test defs.
Remove obsolete framework test definitions. Reorganize to keep all the framework
tests together.

Bug 2562721

Change-Id: Ic96d52dc081eb28f5354954d3d111a77dc1d8db9
2010-04-01 18:38:31 -07:00
Ying Wang
e7f73ba185 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.
2010-04-01 17:42:53 -07:00
Dan Egnor
51823db510 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
2010-04-01 17:42:51 -07:00
Ying Wang
a1c8fb11b2 Merge "Move potentially blocking operation out of the activity controller." into froyo 2010-04-01 17:07:08 -07:00
Dan Egnor
112ffc7662 Remove BugReportSender, which has a happy new home in packages/experimental
Change-Id: I97628264f3249c86d83cded73daf3b1cc291e051
2010-04-01 16:39:31 -07:00
Ying Wang
9731732fe6 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
2010-04-01 14:12:25 -07:00
Romain Guy
0dd05fa9a8 Add sample for XML-defined Adapters.
Change-Id: I31f4f93eeea0f0cac4485ce76d9188608567f071
2010-03-31 19:39:13 -07:00
The Android Open Source Project
4794db1443 am 078f38a3: merge from open-source master 2010-03-31 16:48:56 -07:00
The Android Open Source Project
078f38a382 merge from open-source master
Change-Id: I9bfbf5c98f00a0ec6abb2ad389b5f4d138458441
2010-03-31 16:30:10 -07:00
Brett Chabot
214e945749 am a3916df8: Merge "Add cts hardware tests to continuous test." into froyo 2010-03-31 15:37:49 -07:00