Commit Graph

2264 Commits

Author SHA1 Message Date
Xavier Ducrohet
7d5a0a5b84 am 0b8d6908: Merge change 24031 into eclair
Merge commit '0b8d690837afaac4077150c85c854fdefb076885' into eclair-plus-aosp

* commit '0b8d690837afaac4077150c85c854fdefb076885':
  Update revision of the tools source.properties file.
2009-09-04 16:38:48 -07:00
Android (Google) Code Review
0b8d690837 Merge change 24031 into eclair
* changes:
  Update revision of the tools source.properties file.
2009-09-04 16:36:27 -07:00
Xavier Ducrohet
76140555b0 Update revision of the tools source.properties file.
Change-Id: I02d257baf1e28ee02db262ba4772645002ea0020
2009-09-04 15:26:39 -07:00
Ken Shirriff
163ea4856c am 0d64d339: am 1c3a3c3a: Merge change 23909 into eclair
Merge commit '0d64d33970cb5cb34fb736521b42fbc62182fc93'

* commit '0d64d33970cb5cb34fb736521b42fbc62182fc93':
  Add ddms support for contacts.
2009-09-04 14:16:38 -07:00
Ken Shirriff
0d64d33970 am 1c3a3c3a: Merge change 23909 into eclair
Merge commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4' into eclair-plus-aosp

* commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4':
  Add ddms support for contacts.
2009-09-04 14:13:47 -07:00
Android (Google) Code Review
1c3a3c3a61 Merge change 23909 into eclair
* changes:
  Add ddms support for contacts.
2009-09-04 14:11:50 -07:00
Jean-Baptiste Queru
c5d815a71e am 0c16fb32: merge from open-source master
Merge commit '0c16fb3262fb0ae107da80ffee9b3343b381b679'

* commit '0c16fb3262fb0ae107da80ffee9b3343b381b679':
2009-09-04 11:05:34 -07:00
Xavier Ducrohet
a06511ce6e am 5b6c9944: am 3ce85131: Add method profiling support to DDMS.
Merge commit '5b6c9944d6145ac1563e8363103a3438f5208dae'

* commit '5b6c9944d6145ac1563e8363103a3438f5208dae':
  Add method profiling support to DDMS.
2009-09-04 11:04:31 -07:00
Jean-Baptiste Queru
0c16fb3262 merge from open-source master 2009-09-04 07:50:44 -07:00
Ken Shirriff
a0b2bacaa4 Add ddms support for contacts.
Support the new contacts authname and the aggregation event.
2009-09-03 17:58:28 -07:00
Xavier Ducrohet
5b6c9944d6 am 3ce85131: Add method profiling support to DDMS.
Merge commit '3ce85131be916ea334012276d136a28cf111d123' into eclair-plus-aosp

* commit '3ce85131be916ea334012276d136a28cf111d123':
  Add method profiling support to DDMS.
2009-09-03 16:38:48 -07:00
Xavier Ducrohet
3ce85131be Add method profiling support to DDMS.
New button allows to start/stop tracing. When clicking stop, DDMS downloads
the trace file and starts Traceview.

Also refactored some common parts of the HPROF and tracing handlers into a
common class. The goal is to have a default, extensible implementation
of the HPROF handler that DDMS and the plug-in can reuse. This will reduce
duplicated code.

Change-Id: Ifc48926c7f6f1c3ea49a4aa94053664be83cbb06
2009-09-03 16:01:27 -07:00
Jean-Baptiste Queru
4b4bcaf08c merge from donut 2009-09-03 14:12:47 -07:00
Xavier Ducrohet
6ee953c633 am 56c2f20a: am 2b6f5d17: Merge change 23740 into eclair
Merge commit '56c2f20a8842894cd32edf84647c6912d84c2d91'

* commit '56c2f20a8842894cd32edf84647c6912d84c2d91':
  Add support for opening HPROF files in Eclipse.
2009-09-02 20:22:15 -07:00
Xavier Ducrohet
56c2f20a88 am 2b6f5d17: Merge change 23740 into eclair
Merge commit '2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d' into eclair-plus-aosp

* commit '2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d':
  Add support for opening HPROF files in Eclipse.
2009-09-02 20:20:33 -07:00
Android (Google) Code Review
2b6f5d17a3 Merge change 23740 into eclair
* changes:
  Add support for opening HPROF files in Eclipse.
2009-09-02 20:18:12 -07:00
Xavier Ducrohet
be6e83d5b8 Add support for opening HPROF files in Eclipse.
The action taken on successful HPROF dump can now be configured from
the plug-in preference to be either "save to disk" or "open in eclipse".

If a plug-in supporting .hprof files (such as Eclipse Memory Analyzer Tool)
is present then the file will just be opened in the tool.

"save to disk" does not convert the file, "open in eclipse" does convert
the hprof file (using hprof-conv present in the SDK)

Change-Id: Iceb347abb2af5a2979b6028c22dcbdc3bc7250ca
2009-09-02 20:16:12 -07:00
Xavier Ducrohet
1223971773 am 9fbff8f7: am 46093a92: Make DDMS log way less verbose.
Merge commit '9fbff8f718ff72e5edb4433c90252b0ac99904ff'

* commit '9fbff8f718ff72e5edb4433c90252b0ac99904ff':
  Make DDMS log way less verbose.
2009-09-02 20:10:49 -07:00
Xavier Ducrohet
9fbff8f718 am 46093a92: Make DDMS log way less verbose.
Merge commit '46093a9204309a241b4e83dca4b7fbcba8768959' into eclair-plus-aosp

* commit '46093a9204309a241b4e83dca4b7fbcba8768959':
  Make DDMS log way less verbose.
2009-09-02 20:08:11 -07:00
Xavier Ducrohet
46093a9204 Make DDMS log way less verbose.
All the Log.i() calls were in fact debug logging, so I moved them
to Log.d()

Change-Id: I47b9cd8e85e630d61506c8c2df3baf245a706e03
2009-09-02 18:03:01 -07:00
Raphael
95e561b240 am 04a7d9c6: am a7bb36d1: SDK Updter: change window title to match ADT
Merge commit '04a7d9c6405e40ace60cfe92663f5a6ee0092b87'

* commit '04a7d9c6405e40ace60cfe92663f5a6ee0092b87':
  SDK Updter: change window title to match ADT
2009-09-02 15:37:38 -07:00
Raphael
04a7d9c640 am a7bb36d1: SDK Updter: change window title to match ADT
Merge commit 'a7bb36d181639ffc1bafa9e4080ca4f5691043ba' into eclair-plus-aosp

* commit 'a7bb36d181639ffc1bafa9e4080ca4f5691043ba':
  SDK Updter: change window title to match ADT
2009-09-02 15:34:42 -07:00
Raphael
a7bb36d181 SDK Updter: change window title to match ADT
Also change the name displayed by the "android" wrapping scripts.

Change-Id: I663e1dcadfef7caf2e42138e39b1237f08091c77
2009-09-02 15:17:22 -07:00
Omari Stephens
09476f47e6 am c594a15b: am a43c57a8: Merge change 23664 into eclair
Merge commit 'c594a15b38a3e070b04832c5a76e9ce4740cf30c'

* commit 'c594a15b38a3e070b04832c5a76e9ce4740cf30c':
  Add ContactsProvider tests to runtest as 'contactsprov'
2009-09-02 14:22:48 -07:00
Omari Stephens
c594a15b38 am a43c57a8: Merge change 23664 into eclair
Merge commit 'a43c57a870ee74fe899a0e92beb2f1ac40150387' into eclair-plus-aosp

* commit 'a43c57a870ee74fe899a0e92beb2f1ac40150387':
  Add ContactsProvider tests to runtest as 'contactsprov'
2009-09-02 14:20:30 -07:00
Android (Google) Code Review
a43c57a870 Merge change 23664 into eclair
* changes:
  Add ContactsProvider tests to runtest as 'contactsprov'
2009-09-02 14:19:07 -07:00
Raphael
07dcbb9c77 am 846c7d8b: am b1e9793d: ADT GLE: change error display to a separate sash.
Merge commit '846c7d8b2ee81da0c0905bd51f32065d2ebf7ef2'

* commit '846c7d8b2ee81da0c0905bd51f32065d2ebf7ef2':
  ADT GLE: change error display to a separate sash.
2009-09-02 14:08:30 -07:00
Raphael
846c7d8b2e am b1e9793d: ADT GLE: change error display to a separate sash.
Merge commit 'b1e9793d6620ef973552f4d8672578f1276d68c2' into eclair-plus-aosp

* commit 'b1e9793d6620ef973552f4d8672578f1276d68c2':
  ADT GLE: change error display to a separate sash.
2009-09-02 14:05:53 -07:00
Xavier Ducrohet
157839a1f8 am 76c794b2: am 34103a59: Merge change 23640 into eclair
Merge commit '76c794b224db72253f3ff560505ebc5122b281ca'

* commit '76c794b224db72253f3ff560505ebc5122b281ca':
  Remove unused git files.
2009-09-02 13:34:27 -07:00
Xavier Ducrohet
40b23cb42c am 4f058120: am 5a0b7395: Merge change 23546 into eclair
Merge commit '4f0581204820c6b895c2e8b2dbbfe9347ebd0ead'

* commit '4f0581204820c6b895c2e8b2dbbfe9347ebd0ead':
  Add "Dump HPROF file" to DDMS/DDMS plugin
2009-09-02 13:34:08 -07:00
Omari Stephens
a341046b9d Add ContactsProvider tests to runtest as 'contactsprov'
Also, move GoogleContactsProvider tests from 'contactsprov' to 'gcontactsprov'
Finally, switch the gcontactsprov test to the right coverage class
2009-09-02 13:01:11 -07:00
Raphael
b1e9793d66 ADT GLE: change error display to a separate sash.
This allows GEP to display both the latest error and the latest
successful rendering. The error still needs an icon and the
canvas will need to be grayed or something.

Also the LayoutCanvas will directly use the ILayoutResult and we
won't need to custom EditData in UiElementNode so the correspond
method is @deprecated (but obviously still supported for GLE1.)

Change-Id: Ia3afed836755dbd84a4511eaed0782c85a383ac9
2009-09-02 12:39:24 -07:00
Xavier Ducrohet
76c794b224 am 34103a59: Merge change 23640 into eclair
Merge commit '34103a59621db1de67a42f45dbeed50421ed3bce' into eclair-plus-aosp

* commit '34103a59621db1de67a42f45dbeed50421ed3bce':
  Remove unused git files.
2009-09-02 11:20:50 -07:00
Android (Google) Code Review
34103a5962 Merge change 23640 into eclair
* changes:
  Remove unused git files.
2009-09-02 11:17:32 -07:00
Xavier Ducrohet
43713c575e Remove unused git files.
Change-Id: I1501ae5bc5d8608f149f9d404e198aa9398b665b
2009-09-02 11:14:04 -07:00
Xavier Ducrohet
4f05812048 am 5a0b7395: Merge change 23546 into eclair
Merge commit '5a0b7395be0fc57f168fdc68bb3af68c810abcfe' into eclair-plus-aosp

* commit '5a0b7395be0fc57f168fdc68bb3af68c810abcfe':
  Add "Dump HPROF file" to DDMS/DDMS plugin
2009-09-02 11:02:51 -07:00
Android (Google) Code Review
5a0b7395be Merge change 23546 into eclair
* changes:
  Add "Dump HPROF file" to DDMS/DDMS plugin
2009-09-02 10:54:54 -07:00
Debajit Ghosh
5f2ff00773 fixing NPE that i see on my Mac when running idegen.sh 2009-09-01 22:20:31 -07:00
Eric Fischer
9e688ef136 am 9f742986: am 0c12e21a: Merge change 23532 into eclair
Merge commit '9f742986117baf8d365b8938baec57ccf499041a'

* commit '9f742986117baf8d365b8938baec57ccf499041a':
  Add backslashes before apostrophes so they don't get lost.
2009-09-01 17:35:48 -07:00
Eric Fischer
9f74298611 am 0c12e21a: Merge change 23532 into eclair
Merge commit '0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp

* commit '0c12e21a3152b62fb330c86b5ea544e927300608':
  Add backslashes before apostrophes so they don't get lost.
2009-09-01 17:33:25 -07:00
Android (Google) Code Review
0c12e21a31 Merge change 23532 into eclair
* changes:
  Add backslashes before apostrophes so they don't get lost.
2009-09-01 17:30:51 -07:00
Xavier Ducrohet
d2d24351d3 Add "Dump HPROF file" to DDMS/DDMS plugin
This uses the (new in cupcake) VM command through JDWP.
Older VMs are detected through the (also new) 'FEAT' command that notifies
which features the VM supports.

The hprof file is right now saved in /sdcard. Due to donut+ apps not having
the SD Card permission by default, we may need to change this in the (near)
future.

Upon completion of the dump by the VM, DDMS will give the user a file selector
to choose a place to save the file on the host machine.

Future improvements: run (our own) hat, or hprof-conv and a standard hprof
tool (Eclipse MAT integration for instance). This should be configurable
by the user.

Change-Id: I33696b0263e3d0788ad5d90cedf3cd17393d2f9b
2009-09-01 16:29:18 -07:00
Piotr Gurgul
1c5db42320 am 8899d822: am 56098693: Merge change 23515 into eclair
Merge commit '8899d822de7b51368fc7ce4c158a7265e3eccbb3'

* commit '8899d822de7b51368fc7ce4c158a7265e3eccbb3':
  Update apkbuilder to support new property names
2009-09-01 16:13:58 -07:00
Piotr Gurgul
8899d822de am 56098693: Merge change 23515 into eclair
Merge commit '56098693d29346fc3bf995a125e12fb2d3e1523d' into eclair-plus-aosp

* commit '56098693d29346fc3bf995a125e12fb2d3e1523d':
  Update apkbuilder to support new property names
2009-09-01 15:54:39 -07:00
Android (Google) Code Review
56098693d2 Merge change 23515 into eclair
* changes:
  Update apkbuilder to support new property names
2009-09-01 15:52:35 -07:00
Eric Fischer
2528f77daa Add backslashes before apostrophes so they don't get lost.
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
2009-09-01 15:42:46 -07:00
Piotr Gurgul
4280da6d70 Update apkbuilder to support new property names
out.debug.unaligned.package property name has not been updated in
ApkBuilderTask.java and that is why ApkBuilder misbehaved
BUG: 2090896
2009-09-01 15:39:23 -07:00
Xavier Ducrohet
a6ebedb331 am c604b9bb: am 6ef45eb8: Merge change 23388 into eclair
Merge commit 'c604b9bb3d5204e5e4452a671060e28c9f0f8d06'

* commit 'c604b9bb3d5204e5e4452a671060e28c9f0f8d06':
  DDMS now queries the VM for its features.
2009-09-01 13:58:53 -07:00
Brett Chabot
b37223e76e am 3ea427ad: am b8b984d0: Merge change 23420 into eclair
Merge commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3'

* commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3':
  ADT: change continuous test ant script to run both functional and unit tests.
2009-09-01 12:15:55 -07:00
Jean-Baptiste Queru
da29b263fe am 9dc454b1: merge from open-source master
Merge commit '9dc454b1b175af7f94b264295165d84e0abc8f80'

* commit '9dc454b1b175af7f94b264295165d84e0abc8f80':
  Updated to better distinguish between options and operands
  Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor
2009-09-01 12:14:06 -07:00