OSDN Git Service
Raphael [Mon, 17 Oct 2011 18:18:40 +0000 (11:18 -0700)]
am
06c11f18: (-s ours) SDK Manager: display source of packages in tooltip. Do not merge.
* commit '
06c11f189bc32a6d577cd44e801b06bb6c66dae4':
SDK Manager: display source of packages in tooltip. Do not merge.
Raphael [Mon, 17 Oct 2011 18:18:39 +0000 (11:18 -0700)]
am
88c1eab0: (-s ours) SDK Manager: fix duplicated Extra Packages. Do not merge.
* commit '
88c1eab05a7fec76c8a00e4a420fb69b5e1a6310':
SDK Manager: fix duplicated Extra Packages. Do not merge.
Raphael [Mon, 17 Oct 2011 18:18:35 +0000 (11:18 -0700)]
am
007fa449: (-s ours) SDK Manager: don\'t output XML parse errors to stderr. Do not merge.
* commit '
007fa449ff5525b2f56939775932a62e4458791f':
SDK Manager: don't output XML parse errors to stderr. Do not merge.
Raphael [Mon, 17 Oct 2011 18:18:35 +0000 (11:18 -0700)]
am
2d785c72: (-s ours) SDK Manager: don\'t output XML parse errors to stderr. Do not merge.
* commit '
2d785c72fe93993542cbaee587818825d0623d97':
SDK Manager: don't output XML parse errors to stderr. Do not merge.
Raphael [Mon, 17 Oct 2011 18:18:34 +0000 (11:18 -0700)]
am
578ecf62: (-s ours) DDMS: Fix menu to not say "SWT". Do not merge.
* commit '
578ecf62a07b7c38c818a8dcec6038f2827c9bc6':
DDMS: Fix menu to not say "SWT". Do not merge.
Raphael [Mon, 17 Oct 2011 18:18:30 +0000 (11:18 -0700)]
am
46f17d83: (-s ours) SDK Manager: Fix disabled quit menu on Mac. Do not merge.
* commit '
46f17d83fc06f5f5db984ea9b669afdcc3693258':
SDK Manager: Fix disabled quit menu on Mac. Do not merge.
Siva Velusamy [Mon, 17 Oct 2011 18:18:29 +0000 (11:18 -0700)]
am
2c1df8e7: (-s ours) SDK Manager: Remove APPLICATION_MODAL from shell style. Do not merge.
* commit '
2c1df8e777ced3590379dfc573a51124d4523c00':
SDK Manager: Remove APPLICATION_MODAL from shell style. Do not merge.
Raphael [Fri, 14 Oct 2011 00:28:14 +0000 (17:28 -0700)]
SDK Manager: display source of packages in tooltip. Do not merge.
(cherry picked from commit
d0babf526623d775506553f28972d05064856960)
Change-Id: Ib75d1af09f232d3f364b61500b812dd46bbf63ab
Raphael [Fri, 14 Oct 2011 05:43:49 +0000 (22:43 -0700)]
SDK Manager: fix duplicated Extra Packages. Do not merge.
(cherry picked from commit
a0fcdd03d2a6475d59441443ec21888043514ca9)
Change-Id: I24dece735bd55a6f1a0f03c29218386ac4a31738
Raphael [Sat, 8 Oct 2011 00:04:38 +0000 (17:04 -0700)]
SDK Manager: don't output XML parse errors to stderr. Do not merge.
(cherry picked from commit
627ab8dcda7ff08c4a9b6de4f50768a3573ad333)
Change-Id: I252cb444885067e9456ae4ee36250b7a932f2804
Raphael [Fri, 14 Oct 2011 03:57:05 +0000 (20:57 -0700)]
SDK Manager: don't output XML parse errors to stderr. Do not merge.
This is exactly like change I6f82b040 except now we
remove the stderr output when parsing the addons_list.xml
To put this in context, end-users should not see any
xml parsing error. In this case we get one because the
file doesn't exist on the test server and the web server
returns an HTML page describing the error, which naturally
fails to validate against our XSD. But since the point of
the method is just to validate, errors are irrelevant.
(cherry picked from commit
9d38047fb0c217cc3ee5ef01edf920ae642edb9a)
Change-Id: I31d86e9e7a61ce2fa595d5a2bcf4f8f76155decd
Raphael [Thu, 13 Oct 2011 17:36:44 +0000 (10:36 -0700)]
DDMS: Fix menu to not say "SWT". Do not merge.
SDK Bug: 20615
(cherry picked from commit
a84dcfef93b62171ede7e3743adb04e2ade5b290)
Change-Id: I14c2e3f3df52517b4511a700f67e1ada623cae1f
Raphael [Wed, 12 Oct 2011 22:45:44 +0000 (15:45 -0700)]
SDK Manager: Fix disabled quit menu on Mac. Do not merge.
This was due to the shell being marked as app_modal.
SDK Bug: 20616
(cherry picked from commit
ae3597ad203b835eeded92fc01466456cfeccf39)
Change-Id: Ic1f7d79efcabd28700978c4ac8ae13b283146c8e
Siva Velusamy [Thu, 6 Oct 2011 00:04:55 +0000 (17:04 -0700)]
SDK Manager: Remove APPLICATION_MODAL from shell style. Do not merge.
Have APPLICATION_MODAL causes the log window to never have focus.
This patch has been tested only on Linux.
Updated by Raphael:
- Differentiate behavior for Linux.
- Also apply to the AVD manager standalone window.
(cherry picked from commit
b0f4e888025fbf2273bd25b130afe892e8b0d3ea)
Change-Id: Icae2c9af7a73a2026b0ab392511011097431cf49
Raphael [Mon, 17 Oct 2011 17:43:55 +0000 (10:43 -0700)]
Merge "SDK Manager: env var SDK_TEST_BASE_URL"
Xavier Ducrohet [Sat, 15 Oct 2011 02:03:07 +0000 (19:03 -0700)]
Merge "Fix NPE when building project with no code."
Xavier Ducrohet [Sat, 15 Oct 2011 02:02:58 +0000 (19:02 -0700)]
Merge "Improve indirect library dependency support."
Xavier Ducrohet [Sat, 15 Oct 2011 00:58:09 +0000 (17:58 -0700)]
am
e60ba20e: (-s ours) Fix NPE in projects with no code. Do not merge.
* commit '
e60ba20e3da03f37167e7c7340e04e9de34d3468':
Fix NPE in projects with no code. Do not merge.
Xavier Ducrohet [Sat, 15 Oct 2011 00:57:35 +0000 (17:57 -0700)]
Fix NPE when building project with no code.
The lack of dex file made the Ant package task throw an NPE.
Also some minor typo fix.
Change-Id: Ic617ee66017c402f211f5400baf5a00eb7e6cff5
Xavier Ducrohet [Sat, 15 Oct 2011 00:23:43 +0000 (17:23 -0700)]
Fix NPE in projects with no code. Do not merge.
The lack of dex file made the ant package task throw
an NPE.
Change-Id: Id3de0deb4ec1d6a90f0474ea09d43ddde9cbe97f
Xavier Ducrohet [Sat, 15 Oct 2011 00:26:04 +0000 (17:26 -0700)]
Merge "Add BuildConfig to ant SDK project."
Xavier Ducrohet [Fri, 14 Oct 2011 23:46:45 +0000 (16:46 -0700)]
Improve indirect library dependency support.
Previously with the following setup:
Main app depends on Lib1, Lib2.
Lib1 and Lib2 both depends on Lib3.
Lib3 would be compiled 3 times, as the main app would attempt
to build it and then Libr1, and Lib2 would do it too.
Of course it wasn't actually built 3 times. After the first time it would
do nothing, checking dependencies and do nothing. However, for projects
will a lot of libraries and a lot of indirect dependencies this could
slow down a lot compilations, as the build would spend its time checking
whether to build the same library many times.
This ensure that only the main project attempts to build all of its library
dependencies (direct and indirect), in the right order of course.
When libraries are built they are told (through the "only" target) to not
build their dependencies.
Change-Id: Ie80f32a96e3c473d897aca5d05bf6fe9ea086884
Tor Norbye [Fri, 14 Oct 2011 23:34:27 +0000 (16:34 -0700)]
Merge "Ensure that custom views are unique"
Siva Velusamy [Fri, 14 Oct 2011 19:08:59 +0000 (12:08 -0700)]
gl debugger: Rename SamplesView to GLFramesView
No change in functionality, only rename.
Change-Id: I43d134c9e9acca1761712bfe1a9fc6f4143131af
Tor Norbye [Fri, 14 Oct 2011 22:46:34 +0000 (15:46 -0700)]
Ensure that custom views are unique
There are cases where Eclipse's code search engine returns multiple
instances of the same fully qualified class name when searching for
Views. In order not to show multiple versions of a custom view in the
palette, this changeset changes the CustomViewFinder from using a list
to using a set when accumulating class names.
Change-Id: I4dd9aafe76404efcf8b7bc82a5392f6010ba16f2
Raphael [Fri, 14 Oct 2011 20:11:28 +0000 (13:11 -0700)]
SDK Manager: env var SDK_TEST_BASE_URL
Support a new env var SDK_TEST_BASE_URL that should
be set to the root of an alternate repo. When set
it will completly override the built-in default
repository base URL.
Change-Id: I4852d4c60aac19e2e5c7c34d848b15254d93afb6
Xavier Ducrohet [Fri, 14 Oct 2011 18:13:58 +0000 (11:13 -0700)]
Add BuildConfig to ant SDK project.
The BuildConfig class contains a single boolean constant
called DEBUG which is true only for debug/instrumented builds.
This allows developers to create debug only code that's automatically
stripped from release builds.
Also fixed some issues with dependency check for other tasks, notably
the aapt task that would always find new files due to not filtering
out files that are ignored by aapt itself (hidden files, version control
files, etc...)
Change-Id: I4391a87c064a185d6b337ca46e3a9f0e43c5174d
Siva Velusamy [Fri, 14 Oct 2011 19:05:12 +0000 (12:05 -0700)]
Merge "Use a scale widget to select a particular frame."
Siva Velusamy [Fri, 14 Oct 2011 19:05:03 +0000 (12:05 -0700)]
Merge "Fix some egregious formatting style differences."
Raphael [Fri, 14 Oct 2011 18:25:52 +0000 (11:25 -0700)]
Merge "SDK Manager: fix duplicated Extra Packages."
Siva Velusamy [Fri, 14 Oct 2011 17:40:13 +0000 (10:40 -0700)]
Use a scale widget to select a particular frame.
Currently, a slider (looks like a scrollbar) is present at the top
of the view, with no indication that it can be used to select the
frame to be displayed.
Replace that with the following layout:
Frame: -------------------------------- [23]
where the -'es are the scale widget, and the spinner at the end
indicates the currently selected frame. The spinner and the scale
are linked together to go up/down when either one changes.
Change-Id: Ie5403a179d518e4ebe50dba720c29c5bc07c4369
Raphael [Fri, 14 Oct 2011 05:43:49 +0000 (22:43 -0700)]
SDK Manager: fix duplicated Extra Packages.
Change-Id: I0518515a2095b63099cb69d67d110330b148d5a2
Raphael [Fri, 14 Oct 2011 03:57:05 +0000 (20:57 -0700)]
SDK Manager: don't output XML parse errors to stderr
This is exactly like change I6f82b040 except now we
remove the stderr output when parsing the addons_list.xml
To put this in context, end-users should not see any
xml parsing error. In this case we get one because the
file doesn't exist on the test server and the web server
returns an HTML page describing the error, which naturally
fails to validate against our XSD. But since the point of
the method is just to validate, errors are irrelevant.
Change-Id: I80b2c7600d1ceffa870ac3d71ef0c0f6ef9f809c
Raphael [Fri, 14 Oct 2011 00:28:14 +0000 (17:28 -0700)]
SDK Manager: display source of packages in tooltip.
Change-Id: I52484e7b61100d0c1656769cdce419416ed060c6
Siva Velusamy [Thu, 13 Oct 2011 23:54:07 +0000 (16:54 -0700)]
Fix some egregious formatting style differences.
Minor refactoring: does not affect functionality.
Updated the file SampleView to follow some of the conventions used
in the rest of the ADT plugins. No attempt to fix everything, just
the ones that annoyed me.
Change-Id: Ifd18e2c361ec8592c5efdc9e81ebe84a4eea5c33
Raphael [Thu, 13 Oct 2011 18:18:00 +0000 (11:18 -0700)]
Merge "DDMS: Fix menu to not say "SWT""
Raphael [Thu, 13 Oct 2011 18:15:50 +0000 (11:15 -0700)]
Merge "SDK Manager: Fix disabled quit menu on Mac."
Raphael [Thu, 13 Oct 2011 17:36:44 +0000 (10:36 -0700)]
DDMS: Fix menu to not say "SWT"
SDK Bug: 20615
Change-Id: Id59b96bb8b1beb92c3887b1581bd7969cae4262f
Tor Norbye [Thu, 13 Oct 2011 17:02:45 +0000 (10:02 -0700)]
Merge "Manifest XML completion of minimum SDK"
Tor Norbye [Thu, 13 Oct 2011 14:26:36 +0000 (07:26 -0700)]
Merge "Handle AAPT error messages for skipping files"
Tor Norbye [Tue, 11 Oct 2011 00:45:54 +0000 (17:45 -0700)]
Handle AAPT error messages for skipping files
If the AAPT error parser encounters an error message it is unfamiliar
with, then it aborts out of the parser and just emits all the output
from aapt in the Console instead.
I just ran into a scenario where this happens if your project contains
an XML file with an invalid name, such as a layout whose name starts
with an underscore.
This changeset adds a regexp to recognize these errors such that the
other AAPT errors show up in the Problems view, and you can click to
jump to the offending file for the skipping error.
Change-Id: I884fdb6fdbdfcaa3adbef68bc96e722036e88996
Raphael [Wed, 12 Oct 2011 22:45:44 +0000 (15:45 -0700)]
SDK Manager: Fix disabled quit menu on Mac.
This was due to the shell being marked as app_modal.
SDK Bug: 20616
Change-Id: I1352fe4573f79890f2633be6140c1c63b79150b6
Raphaël Moll [Wed, 12 Oct 2011 20:59:11 +0000 (13:59 -0700)]
Merge "SDK Manager: Remove APPLICATION_MODAL from shell style."
Siva Velusamy [Thu, 6 Oct 2011 00:04:55 +0000 (17:04 -0700)]
SDK Manager: Remove APPLICATION_MODAL from shell style.
Have APPLICATION_MODAL causes the log window to never have focus.
This patch has been tested only on Linux.
Updated by Raphael:
- Differentiate behavior for Linux.
- Also apply to the AVD manager standalone window.
Change-Id: Iff8461e26c3e36712083708969a781b9d5ed63c8
Siva Velusamy [Wed, 12 Oct 2011 18:30:56 +0000 (11:30 -0700)]
Merge "Logcat autoscroll behavior update."
Siva Velusamy [Wed, 12 Oct 2011 17:28:16 +0000 (10:28 -0700)]
Logcat autoscroll behavior update.
Rather than checking the position of the thumb every time entries
are added, we listen to the scroll bar being moved up or down by
the user.
In addition, also update the scrolling behavior whenever entries in
the table are selected. Auto scrolling will stop if anything but the
last entry is selected.
Change-Id: I7b32e9c42bc8e2ad01171b61a5a9ef09d8d0a7b1
Xavier Ducrohet [Tue, 11 Oct 2011 17:22:24 +0000 (10:22 -0700)]
Merge "Improved RenderScript support in SDK build."
Raphael [Tue, 11 Oct 2011 16:41:13 +0000 (09:41 -0700)]
Merge "SDK Manager: Prevent 'adb start-server' from blocking"
Raphael [Tue, 11 Oct 2011 16:17:33 +0000 (09:17 -0700)]
am
1639b002: (-s ours) SDK Manager: fix bug that prevents from installing pkg updates. Do not merge.
* commit '
1639b002a3d2445a6ebf47ed3ccd4e94a4daa3e5':
SDK Manager: fix bug that prevents from installing pkg updates. Do not merge.
Raphael [Fri, 7 Oct 2011 20:09:18 +0000 (13:09 -0700)]
SDK Manager: fix bug that prevents from installing pkg updates. Do not merge.
Purely an UI issue, the Install button is not enabled
correctly for updates, thus preventing users from updating.
Patch 2: changed to have the same code used for both
enabling the buttons and actually selecting what to install
or delete. That will avoid inconsistencies.
Also prevented against a few potential NPEs.
(cherry picked from commit
7f0366ad3128d4911517f351d79e1bbea326c862)
Change-Id: I6cf5117409b5b5c70042f93a8f18723383748174
Raphael [Tue, 11 Oct 2011 00:25:42 +0000 (17:25 -0700)]
SDK Manager: Prevent 'adb start-server' from blocking
SDK Manager hangs on windows after it tries to stop
and restart ADB (e.g. when installing platform-tools).
It hangs when capturing the stdout/stderr pipes -- these
don't close automatically when the process has finished
and these are not interruptible streams.
One workaround is to not capture them, especially since
the output isn't really useful for the installer anyway.
Change-Id: I6554461dfffad2cc8ff0f1fe7d212fdee742e2e6
Raphael [Tue, 11 Oct 2011 05:56:47 +0000 (22:56 -0700)]
SDK Manager: Display remote pkg revision.
Change-Id: I24b49b4b09a9cab8cb1ddd2eade78e9ea21cd867
Xavier Ducrohet [Tue, 11 Oct 2011 00:53:21 +0000 (17:53 -0700)]
Improved RenderScript support in SDK build.
- renderscript output is now in bin/res/ instead of res/
- Ant build system properly handle dependencies to only recompile
files that need it.
Change-Id: Ic2cd4487a26e7a7fcb0b475ee52fa0ccf8a07c0b
Raphael [Fri, 7 Oct 2011 20:09:18 +0000 (13:09 -0700)]
SDK Manager: fix bug that prevents from installing pkg updates
Purely an UI issue, the Install button is not enabled
correctly for updates, thus preventing users from updating.
Patch 2: changed to have the same code used for both
enabling the buttons and actually selecting what to install
or delete. That will avoid inconsistencies.
Also prevented against a few potential NPEs.
Change-Id: I3d209fa4325ffc7624c503395834636b372e8e7e
Siva Velusamy [Mon, 10 Oct 2011 21:26:50 +0000 (14:26 -0700)]
Merge "Remove non-actionable log statement."
Siva Velusamy [Mon, 10 Oct 2011 21:25:44 +0000 (14:25 -0700)]
Remove non-actionable log statement.
Change-Id: I18064d048603c61a5f7d046bbb4cdb39181159de
Raphael [Mon, 10 Oct 2011 21:18:20 +0000 (14:18 -0700)]
Merge "DDMS plugin: Indicate which missing files prevent it from starting"
Raphael [Mon, 10 Oct 2011 21:17:48 +0000 (14:17 -0700)]
Merge "SDK Manager: don't output XML parse errors to stderr"
Siva Velusamy [Mon, 10 Oct 2011 17:48:34 +0000 (10:48 -0700)]
Fix NPE when getCurrentDevice() == null.
Change-Id: I0f9eaf599b5ab22487408ea74d597ea61a22793f
Siva Velusamy [Sun, 9 Oct 2011 21:44:55 +0000 (14:44 -0700)]
Add a new implementation for symbol resolution.
The old implementation can still be used by setting the env variable
ANDROID_DDMS_OLD_SYMRESOLVER.
With the new one, all errors are collected, and displayed in the UI
at the end, grouping similar errors together.
Change-Id: Ibf2fa2122109b2eaf37579d65a3d0b18f475b436
Siva Velusamy [Mon, 10 Oct 2011 17:12:30 +0000 (10:12 -0700)]
Merge "Make the new heap panel to be the default."
Siva Velusamy [Mon, 10 Oct 2011 17:07:26 +0000 (10:07 -0700)]
Merge "Add a whitespace character when scanning across tokens."
Tor Norbye [Fri, 7 Oct 2011 02:50:48 +0000 (19:50 -0700)]
Manifest XML completion of minimum SDK
Change-Id: I9b3fa070e051bd16a9b9e81ffaaa1799594b62ab
Siva Velusamy [Sun, 9 Oct 2011 23:21:14 +0000 (16:21 -0700)]
Make the new heap panel to be the default.
The old implementation can be used via the env var
ANDROID_DDMS_OLD_HEAP_PANEL=1
Change-Id: Iaf6320d3af73d94d0712e476f8a33d07349f415a
Siva Velusamy [Sun, 9 Oct 2011 23:07:53 +0000 (16:07 -0700)]
Add a whitespace character when scanning across tokens.
Change-Id: I6473c1e987c37fb69f808c26e2a7e0f451ab1d34
Tor Norbye [Sun, 9 Oct 2011 17:16:16 +0000 (10:16 -0700)]
Modify validator to reject file resource names starting with _
Change-Id: I23cea24d7363597968d6602b5a056a59085b9c6c
Raphael [Sat, 8 Oct 2011 00:04:38 +0000 (17:04 -0700)]
SDK Manager: don't output XML parse errors to stderr
Change-Id: I6f82b040e8a2f91c24b7e75b3371f249b0b0f383
Raphael [Fri, 7 Oct 2011 19:54:19 +0000 (12:54 -0700)]
SDK Manager: select just new or just updates.
This splits the "Select New/Updates" link in the
SDK Manager in 2 parts. Behavior is:
- at startup, the sdk manager selects both new and updates.
- one can click on deselect + select new to select
just new packages.
- one can click on deselect + select updates to select
just update packages.
- select does not select first, so clicking both new
then update will produce the previous behavior.
SDK Bug: 20607
Change-Id: Ib861d78b746f4f3c7a8fce421c89ae8094339933
Raphael [Fri, 7 Oct 2011 04:41:26 +0000 (21:41 -0700)]
DDMS plugin: Indicate which missing files prevent it from starting
DDMS plugin checks for 3 files when the tools location is set.
If any is missing, it won't connect to ADB. However there is
no way to know that exactly. This adds a log with the path
of the missing file.
Change-Id: If7b679342e6eef314470f63998cdb701e1e1920b
Siva Velusamy [Fri, 7 Oct 2011 18:11:49 +0000 (11:11 -0700)]
am
f3a1c511: (-s ours) Cherrypick
e6c1198 from master for r14. do not merge.
* commit '
f3a1c511c69b5733256e12b5b659e69f006a77fb':
Cherrypick
e6c1198 from master for r14. do not merge.
Siva Velusamy [Fri, 7 Oct 2011 17:17:06 +0000 (10:17 -0700)]
Cherrypick
e6c1198 from master for r14. do not merge.
Project location should not be set if it is in workspace.
If the project is created inside the workspace, then the project
description should not set the location. Otherwise the project
creation will fail with an error.
Change-Id: Id1b1a2e6f18d988659727953fad131a14c841dfb
Xavier Ducrohet [Fri, 7 Oct 2011 18:00:02 +0000 (11:00 -0700)]
Merge "Project location should not be set if it is in workspace."
Siva Velusamy [Fri, 7 Oct 2011 17:17:06 +0000 (10:17 -0700)]
Project location should not be set if it is in workspace.
If the project is created inside the workspace, then the project
description should not set the location. Otherwise the project
creation will fail with an error.
Change-Id: I4b1f63fa516b1fc0473c857656177316c15bf9ae
Raphael Moll [Fri, 7 Oct 2011 04:24:46 +0000 (21:24 -0700)]
am
3ef1b696: SDK: fix typo in atree
* commit '
3ef1b6963686f191f58c001791d25defda873f02':
SDK: fix typo in atree
Raphael Moll [Fri, 7 Oct 2011 04:21:26 +0000 (21:21 -0700)]
SDK: fix typo in atree
it's hprof, not hprov. sigh.
Change-Id: I81a5cb107c18a94fa48c5643a57178407693b83c
Tor Norbye [Fri, 7 Oct 2011 03:00:25 +0000 (20:00 -0700)]
am
0afd6f63: (-s ours) Update GridModel to track GridLayout change. DO NOT MERGE.
* commit '
0afd6f63d4b4b159e61d91af4f12370cf842d534':
Update GridModel to track GridLayout change. DO NOT MERGE.
Tor Norbye [Fri, 7 Oct 2011 02:49:49 +0000 (19:49 -0700)]
Update GridModel to track GridLayout change. DO NOT MERGE.
Change-Id: I1eda08e0be0e07e49dd23c437edd98ae63db4a9a
Tor Norbye [Fri, 7 Oct 2011 02:57:39 +0000 (19:57 -0700)]
Merge "Update GridModel to track GridLayout change"
Tor Norbye [Fri, 7 Oct 2011 02:49:49 +0000 (19:49 -0700)]
Update GridModel to track GridLayout change
Change-Id: Idc4a9af22a54634d5999b3732713e705c0506df8
Xavier Ducrohet [Fri, 7 Oct 2011 02:36:05 +0000 (19:36 -0700)]
am
cde8474e: (-s ours) Cherrypick 26d92b from master for r14. do not merge.
* commit '
cde8474ebe87533a45c250297097e908b1f4e238':
Cherrypick 26d92b from master for r14. do not merge.
Xavier Ducrohet [Fri, 7 Oct 2011 02:23:33 +0000 (19:23 -0700)]
Cherrypick 26d92b from master for r14. do not merge.
Ant build didn't use -non-constant-id for libraries!
Change-Id: I6dffc58d68cf93bad73c419fbf38ee2d0be2dfb0
Xavier Ducrohet [Fri, 7 Oct 2011 02:24:42 +0000 (19:24 -0700)]
Merge "Ant build didn't use -non-constant-id for libraries!"
Xavier Ducrohet [Fri, 7 Oct 2011 02:23:33 +0000 (19:23 -0700)]
Ant build didn't use -non-constant-id for libraries!
Change-Id: I966b8796008b87dd3e6101d8c6d09271e2621c52
Xavier Ducrohet [Fri, 7 Oct 2011 01:57:09 +0000 (18:57 -0700)]
Add logging in ddms.
Change-Id: I42508186ea339de1d97f0de2e801e6152311881a
Xavier Ducrohet [Fri, 7 Oct 2011 01:06:38 +0000 (18:06 -0700)]
The overlay plugin has no src folder.
Change-Id: I48cc8c3e707d63a11320d84b84e62c2a60f28233
Siva Velusamy [Thu, 6 Oct 2011 18:59:55 +0000 (11:59 -0700)]
Minor refactor: keep sizes of snapshot ArrayList's in sync.
Change-Id: I30aef911df1146ff9a64c4d08c4371c2937d4e94
Siva Velusamy [Thu, 6 Oct 2011 18:37:35 +0000 (11:37 -0700)]
Merge "Add support for importing saved heap data."
Tor Norbye [Thu, 6 Oct 2011 18:36:36 +0000 (11:36 -0700)]
Merge "Fix Copy/Paste enablement"
Siva Velusamy [Thu, 6 Oct 2011 16:35:33 +0000 (09:35 -0700)]
Add support for importing saved heap data.
Change-Id: I8552af1754f5093dcdb156f7f81e3beef776835a
Siva Velusamy [Fri, 30 Sep 2011 20:55:31 +0000 (13:55 -0700)]
Model diff snapshot as a subtype of a regular snapshot.
Change-Id: Ic701255c586530214b51a1553b66aa60c6c7b538
Tor Norbye [Thu, 6 Oct 2011 16:59:12 +0000 (09:59 -0700)]
Fix Copy/Paste enablement
This changeset fixes a couple of cases where the Copy/Paste actions
would not be enabled:
* When switching active tabs
* After running some other actions
Change-Id: I03df6fa91641ce722cb7bac615fc73342c77f586
Siva Velusamy [Wed, 5 Oct 2011 23:02:31 +0000 (16:02 -0700)]
Fix NPE: for some properties, description was null.
See http://code.google.com/p/android/issues/detail?id=20447
Change-Id: I7db8f16b4027a9f4582c4a70bf8ad1c048ae7006
Tor Norbye [Wed, 5 Oct 2011 22:29:58 +0000 (15:29 -0700)]
am
6e805fb2: (-s ours) 20542: Contextual prop menu doesn\'t work well for textStyle. DO NOT MERGE.
* commit '
6e805fb2b209a2d346fa561ad02e8f67de70684a':
20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.
Tor Norbye [Wed, 5 Oct 2011 15:46:19 +0000 (08:46 -0700)]
20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.
Change-Id: I6092924b63448b9700ebe5906fab87f11520e27f
Tor Norbye [Wed, 5 Oct 2011 21:24:05 +0000 (14:24 -0700)]
Merge "20542: Contextual prop menu doesn't work well for textStyle"
Raphael [Wed, 5 Oct 2011 20:56:14 +0000 (13:56 -0700)]
am
68ce843e: (-s ours) SDK Manager: fix handling of source URLs. Do not merge.
* commit '
68ce843e28c93465c48db84de09821347cdc8f6a':
SDK Manager: fix handling of source URLs. Do not merge.
Raphael [Wed, 5 Oct 2011 20:36:29 +0000 (13:36 -0700)]
SDK Manager: fix handling of source URLs. Do not merge.
This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.
Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).
(cherry picked from commit
d66d4b7804ce5585bed335168a0c7f3f178a11b0)
Change-Id: Ic127c4111e5028d467ad89c987c5f39cb8f8e8d7
Raphael [Wed, 5 Oct 2011 20:53:42 +0000 (13:53 -0700)]
Merge "SDK Manager: fix handling of source URLs"
Raphael [Wed, 5 Oct 2011 20:36:29 +0000 (13:36 -0700)]
SDK Manager: fix handling of source URLs
This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.
Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).
Change-Id: I5ba133cd0dc984528bf696aef77d00cd9d31ed9c
Siva Velusamy [Wed, 5 Oct 2011 18:56:47 +0000 (11:56 -0700)]
am
d55b705d: (-s ours) Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
* commit '
d55b705d33316e05abfc23cec34708307a4d226e':
Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.