OSDN Git Service
The Android Open Source Project [Mon, 13 Sep 2010 18:08:11 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: If7bfde22466609563307d2c9c46022528b009d6c
Raphael Moll [Mon, 13 Sep 2010 18:04:10 +0000 (11:04 -0700)]
Merge "SDK: Use Android's SparseArray classes."
Raphael Moll [Sat, 11 Sep 2010 05:19:11 +0000 (22:19 -0700)]
GLE2: Properly represent mixed choices in dynamic context menu.
Example: when display the context menu for a multiple selection,
some items might be on wrap_parent whilst others might be in
match_parent. This new change has the menu display a different
icon for these choices and indicate that N out of M items are
in a given state. Basically this converts boolean support to
a tristate support.
Change-Id: Ia409a87fa17e5d36912ace6dde5f4eb094fa865f
Raphael Moll [Sat, 11 Sep 2010 05:17:45 +0000 (22:17 -0700)]
SDK: Use Android's SparseArray classes.
These are a fantastic replacement for Map when you have
int keys.
Change-Id: Ied0feaa9e723ede3372c5a156a72929daa5797e0
The Android Open Source Project [Sat, 11 Sep 2010 01:43:06 +0000 (18:43 -0700)]
merge from open-source master
Change-Id: I7f8d4353f2905aa5de511e61f4d0f13e0bc4ddc6
Xavier Ducrohet [Fri, 10 Sep 2010 23:54:32 +0000 (16:54 -0700)]
Fix test ant rules.
They were importing the old name of the main rules.
Change-Id: If5d591d48f420e5bd8a24843c99befdbb487cd80
The Android Open Source Project [Fri, 10 Sep 2010 21:52:12 +0000 (14:52 -0700)]
merge from open-source master
Change-Id: I2c05f25df603002fca6fb827893d76799c0fb3dd
Raphael Moll [Fri, 10 Sep 2010 07:21:40 +0000 (00:21 -0700)]
GLE2: Indicate when drag'n'drop is rejected in RelativeLayout.
This is the case where a view from a RelativeLayout is being
moved on a dependent view. Now it marks the view with a blue
cross to give a clue that it's not a suitable target.
Change-Id: I9989427ae9b52e054ff0dcee7cfe860a240ded29
Raphael Moll [Fri, 10 Sep 2010 06:41:18 +0000 (23:41 -0700)]
GLE2: display selection a bit better.
Change-Id: Ifb1297299697712273694b239a07cf0812e20e7b
The Android Open Source Project [Fri, 10 Sep 2010 06:12:49 +0000 (23:12 -0700)]
merge from open-source master
Change-Id: I7b1a186d7e1d469d873d1f0a63acfa9cb404da0a
Raphael Moll [Fri, 10 Sep 2010 06:06:07 +0000 (23:06 -0700)]
Merge "ADT GLE2: adjust selection on right-click or drag."
The Android Open Source Project [Fri, 10 Sep 2010 02:21:01 +0000 (19:21 -0700)]
merge from open-source master
Change-Id: I70ad5eb8ea57d0a224cb5ed0cc3d4d65a7afc58a
Raphael Moll [Fri, 10 Sep 2010 00:11:29 +0000 (17:11 -0700)]
ADT GLE2: adjust selection on right-click or drag.
Change-Id: I553e2d659f95d727e87df5d174d737a220a1685d
Xavier Ducrohet [Thu, 9 Sep 2010 23:53:03 +0000 (16:53 -0700)]
Update export wizard for new release export.
Use the ExportHelper to fully rebuild the release
package as taking the debug package no longer works
(because it inserts debuggable=true).
Also clean up the ApkSettings thing that's not
used anymore.
Change-Id: Ia47c316df80f614d6c43fb5c625ccd859c3baa37
The Android Open Source Project [Thu, 9 Sep 2010 04:02:58 +0000 (21:02 -0700)]
merge from open-source master
Change-Id: Ieb44492164256a2f01a8a7062b5cf868398b5ddf
Xavier Ducrohet [Thu, 9 Sep 2010 03:49:45 +0000 (20:49 -0700)]
Fix platform update site categories.
Change-Id: Ib569e389aecea51fd15dde3b838d2b17581127c6
The Android Open Source Project [Thu, 9 Sep 2010 03:21:28 +0000 (20:21 -0700)]
merge from open-source master
Change-Id: I9be77e4dd63859b6679a87895f693c32128eea32
Raphael Moll [Thu, 9 Sep 2010 03:05:12 +0000 (20:05 -0700)]
Merge "GLE2: perform all context menu edits in the same undo session."
The Android Open Source Project [Thu, 9 Sep 2010 01:59:03 +0000 (18:59 -0700)]
merge from open-source master
Change-Id: I19aead365e0e65b12dd92c0b9ae4b8cc8ff60bdf
Xavier Ducrohet [Thu, 9 Sep 2010 01:44:05 +0000 (18:44 -0700)]
Fix internal update site.
Platform category didn't have a desc which seems
cause problems.
Change-Id: I449279fd191254c486556573717f215c0a56a479
Raphael Moll [Wed, 8 Sep 2010 18:14:23 +0000 (11:14 -0700)]
GLE2: perform all context menu edits in the same undo session.
Change-Id: I9516066edaa1704725ab234f1a65664d5eabfb39
The Android Open Source Project [Thu, 9 Sep 2010 01:12:53 +0000 (18:12 -0700)]
merge from open-source master
Change-Id: I46c62c2477e6c89c4a8ab325301ff165bdce3d31
Xavier Ducrohet [Thu, 9 Sep 2010 01:05:04 +0000 (18:05 -0700)]
Merge "PDT implements the new extension from ddms"
The Android Open Source Project [Wed, 8 Sep 2010 23:50:41 +0000 (16:50 -0700)]
merge from open-source master
Change-Id: Ic12592637d021cbfe29bed5f2308416cbb489a53
Raphael Moll [Wed, 8 Sep 2010 23:45:27 +0000 (16:45 -0700)]
Merge "GLE2: fix executing actions on multi-selection"
Raphael Moll [Wed, 8 Sep 2010 23:45:16 +0000 (16:45 -0700)]
Merge "GLE2: Don't change the selection on right click > menu."
The Android Open Source Project [Wed, 8 Sep 2010 23:38:49 +0000 (16:38 -0700)]
merge from open-source master
Change-Id: If27e3d00358f920504d8b1e79a920c35c01dd0d4
The Android Open Source Project [Wed, 8 Sep 2010 23:27:17 +0000 (16:27 -0700)]
merge from open-source master
Change-Id: I4ea274d1cb20345abc8e96c5d1584b0b709c8eb2
Xavier Ducrohet [Wed, 8 Sep 2010 23:25:26 +0000 (16:25 -0700)]
Merge "Fix max memory to be 512, not 5126"
Xavier Ducrohet [Wed, 8 Sep 2010 23:20:52 +0000 (16:20 -0700)]
Merge "Manifest process name can start with :"
Xavier Ducrohet [Wed, 8 Sep 2010 21:27:10 +0000 (14:27 -0700)]
Fix max memory to be 512, not 5126
Change-Id: Ibf1d070d89514a5faf1ed4f33f72dd6385ff534e
Raphael Moll [Tue, 7 Sep 2010 21:12:40 +0000 (14:12 -0700)]
GLE2: fix executing actions on multi-selection
Change-Id: I057dca413d81c9ae3e00bc074eeb31b032f7e85e
Raphael Moll [Tue, 7 Sep 2010 20:57:36 +0000 (13:57 -0700)]
GLE2: Don't change the selection on right click > menu.
Change-Id: I94c4a1bc57287d250963456339aa24e6a10a92c0
Xavier Ducrohet [Wed, 8 Sep 2010 00:25:55 +0000 (17:25 -0700)]
PDT implements the new extension from ddms
Change-Id: I9622deec64ca60b9bfc2a4cdfa640821123ad4c0
The Android Open Source Project [Wed, 8 Sep 2010 01:01:23 +0000 (18:01 -0700)]
merge from open-source master
Change-Id: I01eb95ad2873643098d75d58f843c7aa26ed56b2
Xavier Ducrohet [Wed, 8 Sep 2010 00:53:04 +0000 (17:53 -0700)]
Fix interdepency between ADT and DDMS.
The issue was due to DDMS instantiating ADT classes
in start() when ADT was doing the same with DDMS classes.
This prevented the plug-ins from loading.
Change-Id: Ifea9e0fdcfb14581931d734cdd232c537537c30d
The Android Open Source Project [Wed, 8 Sep 2010 00:26:44 +0000 (17:26 -0700)]
merge from open-source master
Change-Id: Ie16dd0a00241fb650057651cda014bbb376d146c
Xavier Ducrohet [Wed, 8 Sep 2010 00:25:11 +0000 (17:25 -0700)]
Merge "Open the debug perspective when showing hprof files."
Xavier Ducrohet [Wed, 8 Sep 2010 00:24:56 +0000 (17:24 -0700)]
Merge "New extension points for DDMS"
Xavier Ducrohet [Tue, 7 Sep 2010 23:47:16 +0000 (16:47 -0700)]
Manifest process name can start with :
When an activity (or other component) starts with :
the actual process name become <package>:<name>.
This needs to be done in the manifest parser so that
matches can be found.
Change-Id: Ib4407bc7e3f9f73f60aa9f7e391bc90e0aebf35f
The Android Open Source Project [Tue, 7 Sep 2010 23:27:14 +0000 (16:27 -0700)]
merge from open-source master
Change-Id: I3941348e7467354f462ce2980a51caf560245342
Xavier Ducrohet [Tue, 7 Sep 2010 23:21:06 +0000 (16:21 -0700)]
Merge "Update the change log for the tools and sdk."
Xavier Ducrohet [Tue, 7 Sep 2010 23:19:56 +0000 (16:19 -0700)]
Open the debug perspective when showing hprof files.
This prevents the creation of an editor area in the
ddms perspective (the only way to get rid of it later
seems to be to reset the perspective).
Change-Id: I1eb4a3f6a77f27cc462b18b9db43d27cfef09337
Xavier Ducrohet [Tue, 7 Sep 2010 22:54:35 +0000 (15:54 -0700)]
New extension points for DDMS
debugger connector is used by the "debug running app" button in the
device list view.
source revealer is used by the thread panel when double clicking
on an entry of the stack trace.
Change-Id: Ida07617a24d37f1d769d86859fd35d5bb19f5fd2
The Android Open Source Project [Tue, 7 Sep 2010 20:20:53 +0000 (13:20 -0700)]
merge from open-source master
Change-Id: I0eb4eb60c095693a26e76cc3051d77df2aefccb1
Xavier Ducrohet [Tue, 7 Sep 2010 20:18:31 +0000 (13:18 -0700)]
Update the change log for the tools and sdk.
Change-Id: I4e1a779aafd1a658858a00d9706bd679b6621aeb
Raphael Moll [Tue, 7 Sep 2010 20:12:58 +0000 (13:12 -0700)]
Merge "GLE2: Extract the dynamic context menu handling."
The Android Open Source Project [Tue, 7 Sep 2010 19:58:27 +0000 (12:58 -0700)]
merge from open-source master
Change-Id: I4456cbab0228986b0c8d3396ebf8ee59dff65229
Xavier Ducrohet [Tue, 7 Sep 2010 19:57:43 +0000 (12:57 -0700)]
Merge "First version of the PDT."
Xavier Ducrohet [Tue, 7 Sep 2010 19:57:35 +0000 (12:57 -0700)]
Merge "DDMS now receives the adb location through an extension point."
Raphael Moll [Fri, 3 Sep 2010 19:44:10 +0000 (12:44 -0700)]
GLE2: Extract the dynamic context menu handling.
This is a pure refactoring that extracts the dynamic context
menu handling in a class outside of LayoutCanvas. The original
is long enough like this. It's used by the ouline view too.
Change-Id: I3a9e59bde2e9ceb69479490ca9179aab29cc13a6
Xavier Ducrohet [Sat, 4 Sep 2010 02:22:26 +0000 (19:22 -0700)]
First version of the PDT.
PDT stands for (Android) Platform Development Tools.
The first version is pretty basic. A single pref page
to give the location of the dev tree. From this it
finds the location of adb and provides it to ddms through
its extension point.
Change-Id: Ibed895852bc46b83ac6bf749d0ea37f0a54fad08
Raphael Moll [Tue, 7 Sep 2010 19:49:04 +0000 (12:49 -0700)]
Merge "GLE2: Let scripts display message dialog & input dialog."
The Android Open Source Project [Sun, 5 Sep 2010 22:32:31 +0000 (15:32 -0700)]
merge from open-source master
Change-Id: I05ef47a783f84d9ca1673b65f69ed51c1b8dec35
Brett Chabot [Sun, 5 Sep 2010 22:25:55 +0000 (15:25 -0700)]
Merge "Handle instrumentation time output that contains a bracket."
The Android Open Source Project [Sat, 4 Sep 2010 01:11:32 +0000 (18:11 -0700)]
merge from open-source master
Change-Id: I34a0f4d1cf0a4bc95955cb5628faabf6f29b1ee2
Xavier Ducrohet [Sat, 4 Sep 2010 01:06:15 +0000 (18:06 -0700)]
Merge "Doc Change: Updated usage doc for android tool"
Xavier Ducrohet [Sat, 4 Sep 2010 01:05:52 +0000 (18:05 -0700)]
Merge "Doc Change: Updated usage help for Android tool"
Xavier Ducrohet [Sat, 4 Sep 2010 00:14:29 +0000 (17:14 -0700)]
DDMS now receives the adb location through an extension point.
Previously DDMS received the adb location through a normal Java API
which requires the other plug-in to be actually running (This
was done in the the start method of ADT).
The new change allows DDMS to start a plug-in (by loading
an extension provided by the plug-in) to query for the location
of adb.
This allows us to have plug-ins with no UI able to provide
the location of ADB (ie a "platform" plug-in that has no UI
besides a pref page, that is started by DDMS indirectly).
Also cleaned up how HierarchyViewer use the AndroidDebugBridge.
Change-Id: I8e842a294eea94c06417149144a2ce435e719cfd
The Android Open Source Project [Sat, 4 Sep 2010 00:12:30 +0000 (17:12 -0700)]
merge from open-source master
Change-Id: I9d7eca2a536b4646767a7aa1afba2d86b865fb57
Xavier Ducrohet [Fri, 3 Sep 2010 23:57:48 +0000 (16:57 -0700)]
Merge "Move plug-ins version to 8.0.0 to match r8"
Xavier Ducrohet [Fri, 3 Sep 2010 22:09:19 +0000 (15:09 -0700)]
Move plug-ins version to 8.0.0 to match r8
Change-Id: Ia186695240e5f641c517a31ae93100143fc42694
Brett Chabot [Fri, 3 Sep 2010 19:56:14 +0000 (12:56 -0700)]
Handle instrumentation time output that contains a bracket.
Bug
2975380
Change-Id: I51bcb5b3aaaf320b25619b0b8b4679691c4bff7e
Raphael Moll [Fri, 3 Sep 2010 02:49:29 +0000 (19:49 -0700)]
GLE2: Let scripts display message dialog & input dialog.
Change-Id: I0d07d5f7e672d3ef6b077c5cf24ba5f20fe1dabb
The Android Open Source Project [Fri, 3 Sep 2010 00:24:39 +0000 (17:24 -0700)]
merge from open-source master
Change-Id: I1e90c9bc8e467f89b313db0732579612ff152241
Xavier Ducrohet [Fri, 3 Sep 2010 00:14:57 +0000 (17:14 -0700)]
Simplify icons in test apps.
Change-Id: I9dad8dc30e0fa2499c9b003abbe08d91dc4041ab
The Android Open Source Project [Fri, 3 Sep 2010 00:12:05 +0000 (17:12 -0700)]
merge from open-source master
Change-Id: I75d0a0bb0dc46dc1823d5fc2ca609d3a26a5f91b
Xavier Ducrohet [Fri, 3 Sep 2010 00:08:38 +0000 (17:08 -0700)]
Merge "New test projects."
Xavier Ducrohet [Fri, 3 Sep 2010 00:08:25 +0000 (17:08 -0700)]
Merge "Support for debug build in Ant."
Xavier Ducrohet [Fri, 3 Sep 2010 00:08:12 +0000 (17:08 -0700)]
Merge "Fix possible NPE in layout configuration UI."
Xavier Ducrohet [Thu, 2 Sep 2010 21:59:38 +0000 (14:59 -0700)]
Support for debug build in Ant.
"ant debug" now automatically insert debuggable=true in the manifest.
Also cleaned up a lot of the Ant stuff (versioned Ant rules, support
for importing different rules files based on compatibility computation).
This is rendered moot with our new single aapt executable. The ant
rules will now evolve alongside aapt, and there will not be mismatch
between the two.
Change-Id: Iaf309f40e6ab4a0204dfbdb428cfb569bf5ca3b3
Xavier Ducrohet [Wed, 1 Sep 2010 22:06:31 +0000 (15:06 -0700)]
Fix possible NPE in layout configuration UI.
Change-Id: Ib5974aea2a7e5e67133e1d195f569335bd224fed
The Android Open Source Project [Thu, 2 Sep 2010 22:29:04 +0000 (15:29 -0700)]
merge from open-source master
Change-Id: I9b87f366bdd1289cc104c7484bf13bd52b78302b
Xavier Ducrohet [Thu, 2 Sep 2010 22:18:38 +0000 (15:18 -0700)]
New test projects.
Also fixed some trailing space in templates
and automatically generated files.
Change-Id: I2ed5f0067dff4c62b53857b7e0a2dea5dd9a101c
Raphael Moll [Thu, 2 Sep 2010 21:35:46 +0000 (14:35 -0700)]
GLE2: Context menu in Outline view.
Change-Id: I9e149310cd0b0ada5bb16262a2d6d833a54b3c93
Raphael Moll [Thu, 2 Sep 2010 21:06:10 +0000 (14:06 -0700)]
GLE2: Fix comments, refactor context menu code.
Simple refactor of the main method populating the dynamic context menu.
It was started to grow a bit too much.
Also added some comments to explain what's going on.
Change-Id: Id58779da5082bb454c1bcae914582e4471364a12
The Android Open Source Project [Thu, 2 Sep 2010 18:03:34 +0000 (11:03 -0700)]
merge from open-source master
Change-Id: I071e8573b3949afe0ab1c5cd66759891666f68ac
Xavier Ducrohet [Thu, 2 Sep 2010 17:59:17 +0000 (10:59 -0700)]
Merge "ADT refactor the builders into their own package."
Xavier Ducrohet [Thu, 2 Sep 2010 17:52:41 +0000 (10:52 -0700)]
Merge "ADT: Make release and debug builds really different."
Xavier Ducrohet [Thu, 2 Sep 2010 02:38:02 +0000 (19:38 -0700)]
ADT refactor the builders into their own package.
Put the growing list of generic build classes
into the main build package.
Change-Id: I65d7067bb2547d7cc9b71674f4df8a6778dd8ac8
Xavier Ducrohet [Tue, 31 Aug 2010 17:21:29 +0000 (10:21 -0700)]
ADT: Make release and debug builds really different.
Release export should not be debug builds that are
stripped of their signature and (optionnaly) resigned.
Instead they should actually build the apk in "release"
mode.
Refactor PostCompilerHelper to be easier to use for
export feature (moved all error handling into the
actual IncrementalBuilder since we don't want the
helper to put error/warning marker during release
export).
Update the API of ApkBuilder and PostCompilerHelper
to deal better with signing key:
- option to package with a "sign with debug" flag.
- new option to package/sign with given keys.
Debug build (through incremental builder) use the new
aapt option --debug-mode that automatically insert
debuggable=true in the manifest. This allows for the
same source code to generate debug and release builds.
Currently, only the "export unsigned release apk"
action use the new "release" build. Need to update
the export wizard. Also need to add support for this
in Ant.
New folder in sdk.git/testapps for test projects
to be used in upcoming automated build tests.
Simple "basicProject" to start with.
Change-Id: I3041312bc817153603656de2aa355f8fcaf00b5b
The Android Open Source Project [Thu, 2 Sep 2010 01:16:10 +0000 (18:16 -0700)]
merge from open-source master
Change-Id: I3a1a6421773f9c95192f31ea5b55275004d2c1ee
Xavier Ducrohet [Thu, 2 Sep 2010 01:12:52 +0000 (18:12 -0700)]
Merge "Fix Hierarchy viewer plug-in again."
The Android Open Source Project [Wed, 1 Sep 2010 23:51:00 +0000 (16:51 -0700)]
merge from open-source master
Change-Id: I326ef83cd0c38c1f790e0efb0db27ed42c4d8d27
Xavier Ducrohet [Wed, 1 Sep 2010 23:45:43 +0000 (16:45 -0700)]
Merge "Previous commit lacked this change to hierarchyviewer."
Xavier Ducrohet [Wed, 1 Sep 2010 23:44:19 +0000 (16:44 -0700)]
Previous commit lacked this change to hierarchyviewer.
This is meant to be part of the fix for MacOs X.
Change-Id: Ic2090cd7806f4ae7801851aa0b3f9b8975f150af
The Android Open Source Project [Wed, 1 Sep 2010 23:38:55 +0000 (16:38 -0700)]
merge from open-source master
Change-Id: Ifaf1c541ccef33ec3870bf8ce1af84d0988ce2dd
Raphael Moll [Wed, 1 Sep 2010 23:34:51 +0000 (16:34 -0700)]
Merge changes I682ba19d,Ie7451c21
* changes:
GLE2 context menu: Handle boolean properties as tri-state.
GLE2 context menu support.
Raphael Moll [Wed, 1 Sep 2010 22:32:22 +0000 (15:32 -0700)]
GLE2 context menu: Handle boolean properties as tri-state.
Also offer a clear option for enums and flags.
Change-Id: I682ba19d9f5a1c1d5da28909b02a90ec01f4fc62
Xavier Ducrohet [Wed, 1 Sep 2010 20:05:14 +0000 (13:05 -0700)]
Fix Hierarchy viewer plug-in again.
Change-Id: I15ef8c3050826c7f17dc1ee822a3c8e268c62c36
The Android Open Source Project [Wed, 1 Sep 2010 13:29:53 +0000 (06:29 -0700)]
merge from open-source master
Change-Id: Ice1e427b16ca26f69118c689edea5a662c88a0fe
The Android Open Source Project [Wed, 1 Sep 2010 13:18:44 +0000 (06:18 -0700)]
merge from tools_r7
Change-Id: I061d6122963907a348ec592bd08077df302413e2
The Android Open Source Project [Wed, 1 Sep 2010 13:18:40 +0000 (06:18 -0700)]
merge from open-source master
Change-Id: I904122226e2940610970b75588884c2efe2d2000
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:16:36 +0000 (06:16 -0700)]
Revert "Fixed problem with keymap files copied to target"
This reverts commit
1fc95cae8ec2ccfe134ff279ed9082311ad0d877.
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:11:12 +0000 (06:11 -0700)]
Revert "Fixed problem with keymap files copied to target"
This reverts commit
246e0ee6968ed0030fe99cc12ca154a1513b8645.
The Android Open Source Project [Wed, 1 Sep 2010 02:29:33 +0000 (19:29 -0700)]
merge from open-source master
Change-Id: Id0e5d83d78ebe2bde482fa60acda7f80220bced5
Xavier Ducrohet [Wed, 1 Sep 2010 02:22:38 +0000 (19:22 -0700)]
Merge "Fix HierarchyViewer2 to run on MacOS X correctly."
Xavier Ducrohet [Wed, 1 Sep 2010 00:50:58 +0000 (17:50 -0700)]
Fix HierarchyViewer2 to run on MacOS X correctly.
This also fix the issue with the app never closing correctly
(throwing an exception).
Also updated the launcher script to match the new ones we use in
the other Java based tools.
Change-Id: I851f0732a78c6e6c072728f05e611f01eee8fc19
Raphael Moll [Fri, 27 Aug 2010 07:02:30 +0000 (00:02 -0700)]
GLE2 context menu support.
Context menu now shows some view properties:
- for all views, quick access to layout width/height.
- for LinearLayout, quick access to orientation.
- for all views, quick access to all boolean, enum or flag attributes.
Some follow up will be necessary in another CL, namely:
- booleans must be tri-states (true, false, cleared).
- need a way to clear enum and flags rather than just change the value.
Change-Id: Ie7451c21f0781f0efb0a1bbc676abef80027c4f7
The Android Open Source Project [Wed, 1 Sep 2010 00:46:09 +0000 (17:46 -0700)]
merge from open-source master
Change-Id: I84ad4aa51e1fe5b90ca1f1ef18fa3f2d5b1c20a0