OSDN Git Service
Tor Norbye [Mon, 11 Jul 2011 19:49:40 +0000 (12:49 -0700)]
Only set the text attribute on views that define it
Ensure that we only set the text attribute on widgets that define
it. Now that we preserve unknown attributes this meant that we'd end
up setting text attributes on all widgets rather than just those that
define it.
Change-Id: Ief67a777ca40149e0be370b7a561f80fbffa3d5d
Tor Norbye [Sat, 9 Jul 2011 03:17:36 +0000 (20:17 -0700)]
Merge "Change scheme for picking tablet or phone configurations"
Tor Norbye [Sat, 9 Jul 2011 02:57:15 +0000 (19:57 -0700)]
Merge "Add deletion hooks for view rules"
Raphael Moll [Sat, 9 Jul 2011 01:17:48 +0000 (18:17 -0700)]
Merge "Add "android create avd --abi" parameter."
Raphael Moll [Fri, 8 Jul 2011 21:48:17 +0000 (17:48 -0400)]
Add "android create avd --abi" parameter.
SDK bug
4965341
Change-Id: Iaff42d1272a9c10ba62534c5d478e35e6c2df6e5
Xavier Ducrohet [Fri, 8 Jul 2011 20:48:19 +0000 (13:48 -0700)]
Merge "Remove System.exit from traceview code running in Eclipse."
Xavier Ducrohet [Fri, 8 Jul 2011 20:34:12 +0000 (13:34 -0700)]
Remove System.exit from traceview code running in Eclipse.
These are remnants of the standalone traceview version and they
can bring Eclipse down if the trace file can't be read.
Change-Id: Ic9a0171f307bc991cd000fa4d35d5c37b47e93b2
Raphaël Moll [Fri, 8 Jul 2011 17:16:17 +0000 (10:16 -0700)]
Merge "Fix locale handling of linear layout weights"
Tor Norbye [Fri, 8 Jul 2011 00:32:46 +0000 (17:32 -0700)]
Fix locale handling of linear layout weights
Fix 18298: ADT r12 layout editor uses locale specific decimal
separator leading to unparsable XML
Change-Id: Ideae319e41f8a7e34075065c63247d50cdf830c5
Tor Norbye [Thu, 7 Jul 2011 18:38:48 +0000 (11:38 -0700)]
Change scheme for picking tablet or phone configurations
Change the code which automatically picks tablet configurations when
the target SDK is 11+ such that it only does this for API 11 and API
12.
Change-Id: Ic59cdd4d7ac2d616069bf79e517987e5ce2517cc
Tor Norbye [Thu, 7 Jul 2011 18:36:11 +0000 (11:36 -0700)]
Add deletion hooks for view rules
This changeset adds a deletion hook to the view rule interface which
lets specific layouts perform cleanup when some of its children are
removed. This is vital for GridLayout where various rows and columns
need to be cleaned up.
In this changeset, this is used by RelativeLayout to remove constraint
references to widgets that have been deleted. Without this, you could
have Button2 reference Button1, then delete Button1, and when you drop
a new button, it will be assigned the now available name "Button1" and
the old constraint would kick back in!
Change-Id: Ic5829228cff38bfdc291988b1a2ef172e9aa4de5
Xavier Ducrohet [Thu, 7 Jul 2011 01:18:38 +0000 (18:18 -0700)]
Merge "Fix some override issues."
Xavier Ducrohet [Thu, 7 Jul 2011 00:28:42 +0000 (17:28 -0700)]
Fix some override issues.
SDK tools must compile using Java 1.5
Change-Id: I39b708fcb6f1e225bece6b12c1b5909865825ac9
Raphael Moll [Wed, 6 Jul 2011 21:30:24 +0000 (14:30 -0700)]
Merge "Integrate unknown attributes in the normal UiElementNode workflow."
Raphael Moll [Tue, 5 Jul 2011 19:06:54 +0000 (15:06 -0400)]
Integrate unknown attributes in the normal UiElementNode workflow.
Somehow this should have been the default.
There's a few cases where this will allow us to simplify the code
and that will be for another CL.
Also fixes http://code.google.com/p/android/issues/detail?id=17762
Change-Id: Ieccd36f5f4042f414311f09339ed18fc73d7b122
Raphael Moll [Wed, 6 Jul 2011 13:13:29 +0000 (06:13 -0700)]
Merge "SdkManager: pretty-print the 'android' command line help."
Raphael Moll [Fri, 1 Jul 2011 15:51:36 +0000 (11:51 -0400)]
SdkManager: pretty-print the 'android' command line help.
This reflows the command line help so that it wraps nicely
at 78 chars. Also properly finish sentences with dots.
Mere details...
Also added a proper unit test to test various edge cases.
Change-Id: Id2f9eab5014ea9c5f4aae5ed4427b9aebc3c70bf
Raphael Moll [Tue, 5 Jul 2011 23:31:16 +0000 (16:31 -0700)]
Merge "Switch to "android sdk" and "android avd" command line."
Raphael Moll [Tue, 5 Jul 2011 23:30:54 +0000 (16:30 -0700)]
Merge "SdkMan2: Links to select new/updates or deselect all."
Raphael Moll [Tue, 5 Jul 2011 23:30:26 +0000 (16:30 -0700)]
Merge changes I82eb0776,I72fdca12
* changes:
Use GridData/LayoutBuilder in PackagesPage.
SdkManager2: fixes for asynchronous sources UI.
Raphael Moll [Fri, 1 Jul 2011 14:29:36 +0000 (10:29 -0400)]
Switch to "android sdk" and "android avd" command line.
The default with no argument is "android sdk".
Change-Id: I208d7b78dcbeab44a135e4d5bbb4b568b9ce09d7
Raphael Moll [Fri, 1 Jul 2011 03:49:11 +0000 (23:49 -0400)]
SdkMan2: Links to select new/updates or deselect all.
Change-Id: I9c831138342574b0462e39055be86bde7114f54a
Raphael Moll [Fri, 1 Jul 2011 02:38:13 +0000 (22:38 -0400)]
Use GridData/LayoutBuilder in PackagesPage.
Change-Id: I82eb07760e264884c510250245405aa2dfc1cdbe
Raphael Moll [Thu, 30 Jun 2011 19:32:54 +0000 (15:32 -0400)]
SdkManager2: fixes for asynchronous sources UI.
- Properly refresh display list when installing/deleting
a package.
- Gray install/delete buttons during an install/delete
to avoid nesting operations.
Change-Id: I72fdca1252c447b046040afb70e67dfae77188e4
Raphael Moll [Fri, 1 Jul 2011 01:37:15 +0000 (18:37 -0700)]
Merge "Fix SDK Manager unit tests."
Raphael Moll [Fri, 1 Jul 2011 01:29:54 +0000 (21:29 -0400)]
Fix SDK Manager unit tests.
These got broken after I've fixed the sort order
of extra packages in SDK Manager 2.
Change-Id: Ie18f3fb74f800ac855680be29a7932f8c8d9f54c
Brett Chabot [Thu, 30 Jun 2011 23:26:56 +0000 (16:26 -0700)]
Merge "Fix instrumentation repetition parsing and multi listener handling."
Raphael Moll [Thu, 30 Jun 2011 17:31:50 +0000 (10:31 -0700)]
Merge "Sdkman2: Load sources asynchronously."
Jeff Brown [Wed, 29 Jun 2011 02:10:51 +0000 (19:10 -0700)]
Merge "Add a preference for the profiler buffer size."
Jeff Brown [Wed, 29 Jun 2011 02:10:35 +0000 (19:10 -0700)]
Merge "Add support for tracking cpu and real time."
Brett Chabot [Tue, 28 Jun 2011 02:15:11 +0000 (19:15 -0700)]
Fix instrumentation repetition parsing and multi listener handling.
Change-Id: Ib295bb21c45dd2f52f547f86a5b3c4aaa959c139
Jeff Brown [Wed, 29 Jun 2011 02:10:14 +0000 (19:10 -0700)]
Merge "Add a basic properties dialog."
The Android Open-Source Project [Wed, 29 Jun 2011 01:24:40 +0000 (18:24 -0700)]
merge from tools_r12
Change-Id: I83911d9ee56e5d44045a5ecbd28647a551f8ea79
Xavier Ducrohet [Wed, 29 Jun 2011 01:22:56 +0000 (18:22 -0700)]
Merge "Guard against a possible NPE when the rendering fails." into tools_r12
Xavier Ducrohet [Wed, 29 Jun 2011 01:20:06 +0000 (18:20 -0700)]
Guard against a possible NPE when the rendering fails.
Change-Id: I8b0a0c65f2b0d7b7faf10224ac2945081605c5c4
Brett Chabot [Wed, 29 Jun 2011 01:16:56 +0000 (18:16 -0700)]
Merge "pullFile exception handling."
Jeff Brown [Tue, 28 Jun 2011 03:08:15 +0000 (20:08 -0700)]
Merge "Add a horizontal scrollbar."
Jeff Brown [Tue, 28 Jun 2011 00:29:32 +0000 (17:29 -0700)]
Add a preference for the profiler buffer size.
8MB is getting to be too small for some purposes.
Change-Id: Ic711c426febf2e42634bd73a5be6211cfe66f4c0
Bill Napier [Mon, 27 Jun 2011 23:05:26 +0000 (16:05 -0700)]
Merge "Refactored MonkeyRunner to use ChimpChat"
Jeff Brown [Thu, 23 Jun 2011 02:48:45 +0000 (19:48 -0700)]
Add support for tracking cpu and real time.
Enhanced TraceView to support extracting cpu and real time profile
data from traces and plotting them accordingly.
In contrast, the original thread-cpu algorithm incorrectly assumed
that threads could not execute in parallel so it would produce
inaccurate representations of the global execution timeline on SMP
systems.
To use this feature, Dalvik must be restarted with appropriate
profiling options.
Collect CPU time only (default). Global timeline must be inferred.
adb shell setprop dalvik.vm.extra-opts -Xprofile:threadcpuclock
Collect real time only. CPU usage information is not available.
adb shell setprop dalvik.vm.extra-opts -Xprofile:wallclock
Collect CPU time and real time information. Most accurate but
requires a newer VM.
adb shell setprop dalvik.vm.extra-opts -Xprofile:dualclock
TraceView remains compatible with traces gathered on older devices
and produces identical output when analyzing traces gathered with
the thread-cpu clock.
Added a feature that displays the exclusive and inclusive time
information while hovering over a method.
Added a feature that displays the time spent in a context switch
by a simple 1 pixel underline within the body of the method call.
This makes it much easier to identify long running methods that
spend most of their time blocked on a wait.
Fixed a bug in the way that the method call highlights were
displayed which could cause them to be truncated down to a
single-pixel width depending on the pixel alignment of the
start and end of each segment.
Change-Id: Id2e6d101d9c604a0029e0920127871f88013faa0
Raphael Moll [Fri, 24 Jun 2011 23:57:23 +0000 (16:57 -0700)]
Sdkman2: Load sources asynchronously.
Change-Id: Ic79b987ce8594e7bfe30b32e961b9384e2538b6b
Jeff Brown [Wed, 22 Jun 2011 23:58:49 +0000 (16:58 -0700)]
Add a basic properties dialog.
Shows some information about the trace that can be of interest,
such as which timing mode (thread time or wall time) was used.
Change-Id: I0f00b69dc5d3982f346cfc08e12eb5b379430a96
Jeff Brown [Wed, 22 Jun 2011 23:07:06 +0000 (16:07 -0700)]
Add a horizontal scrollbar.
Change-Id: I077240805c45f71c8e270cada39bad3168061dfa
Raphael Moll [Fri, 24 Jun 2011 19:22:00 +0000 (12:22 -0700)]
Merge "Sdkman2: Simplify packages names, fix extra package sort."
Raphael Moll [Fri, 24 Jun 2011 19:21:19 +0000 (12:21 -0700)]
Merge "Sdkman2: Rename "Sort by Source" to "Sort by Repository""
Raphael Moll [Fri, 24 Jun 2011 19:20:58 +0000 (12:20 -0700)]
Merge "SdkMan2: sort Tool category at the top."
Xavier Ducrohet [Fri, 24 Jun 2011 19:09:45 +0000 (12:09 -0700)]
Merge "Fix value parser to handle attr values not in declare-styleable."
Xavier Ducrohet [Fri, 24 Jun 2011 18:42:32 +0000 (11:42 -0700)]
Fix value parser to handle attr values not in declare-styleable.
Also change the layoutlib sample code to properly get the list
of framework attr flag/enum values.
Change-Id: Ie0bf126a0fab574d94d0f86b7b2f8581cf4eaae3
Raphael Moll [Fri, 24 Jun 2011 00:18:52 +0000 (17:18 -0700)]
Sdkman2: Simplify packages names, fix extra package sort.
Simplify package names when sorted by API, that is
don't repeat "API nn" or "Android x.y" in the package
names if it matches to category.
Fix sorting of packages to properly sort extras
by vendor+path. The previous sort was broken as
it was making the revision number more important
than the vendor+path for extras.
Change-Id: I51ed0114ab9c77ef5d94710fc2449e5be9cd2ad9
Brett Chabot [Thu, 23 Jun 2011 21:45:51 +0000 (14:45 -0700)]
pullFile exception handling.
Make SyncService.pullFile throw SyncException instead of IOException
if it cannot write to local file.
Bug
4600585
Change-Id: Ic3ab9fd7d1a05280ee14a310b9c8053371bb4e37
Raphael Moll [Thu, 23 Jun 2011 21:48:12 +0000 (14:48 -0700)]
Sdkman2: Rename "Sort by Source" to "Sort by Repository"
Change-Id: I3f1f0f8781cae29400f7b49d2c92e6f2b83783c2
Raphael Moll [Thu, 23 Jun 2011 21:43:55 +0000 (14:43 -0700)]
SdkMan2: sort Tool category at the top.
Change-Id: I8bc57a04a48cd540e6457a0b69b4911475989d8c
Xavier Ducrohet [Thu, 23 Jun 2011 21:18:58 +0000 (14:18 -0700)]
Merge "Sample code to use the layout rendering library."
Xavier Ducrohet [Fri, 1 Apr 2011 21:11:47 +0000 (14:11 -0700)]
Sample code to use the layout rendering library.
This is very basic sample code showing how to render
a layout.
This explains how to load the resources, create Folderconfig,
ResourceResolver, and how to call the LayoutLibrary to do an
actual render.
There are some big limitations:
- can't render custom views because there's nothing
compiling them and generating the compiled R.class
file.
- not all features of ADT are present because there
are things that don't make sense outside of an editor
(render in context, expand empty layouts, etc...)
Change-Id: I0c8676ebfbff27f0e9412bb4b13193ce64082372
Raphael Moll [Wed, 22 Jun 2011 23:04:46 +0000 (16:04 -0700)]
Merge "Enable SdkManager2 and AvdManager1 windows in ADT."
Raphael Moll [Wed, 22 Jun 2011 13:40:52 +0000 (06:40 -0700)]
Merge "SdkManager2: window can be closed during load."
Raphael Moll [Tue, 21 Jun 2011 23:59:49 +0000 (16:59 -0700)]
Enable SdkManager2 and AvdManager1 windows in ADT.
Change-Id: I041fe4f6888dcc44f6f81319d05caed9311cc6ff
Raphael Moll [Tue, 21 Jun 2011 23:57:58 +0000 (16:57 -0700)]
SdkManager2: window can be closed during load.
Since the sdkmanager2 loads its packages whilst
not blocking the UI, it's entirely possible for the
user to request the app to close whilst it load.
This makes sure we test for disposed widgets after
loading before trying to update them.
Change-Id: I9f0a82f0da5275996fd7275bd55de36986685dad
Xavier Ducrohet [Tue, 21 Jun 2011 20:59:04 +0000 (13:59 -0700)]
Merge "Move tools to 13."
Xavier Ducrohet [Tue, 21 Jun 2011 20:23:51 +0000 (13:23 -0700)]
Move tools to 13.
Change-Id: Ibedcb5627170d107cacf5e9d212f9da11c8d1f3e
Bill Napier [Mon, 20 Jun 2011 23:36:58 +0000 (16:36 -0700)]
Merge "Extracted ChimpChat from MonkeyRunner"
Michael Wright [Mon, 13 Jun 2011 16:17:03 +0000 (09:17 -0700)]
Refactored MonkeyRunner to use ChimpChat
Change-Id: Icbe5bcb066021d578faae43aa49b58ab1595870b
Michael Wright [Mon, 13 Jun 2011 16:15:08 +0000 (09:15 -0700)]
Extracted ChimpChat from MonkeyRunner
Extracted ChimpChat, the library for communication with Monkey from
MonkeyRunner
Change-Id: Ia9f966549d27abc9f494b2b001099d8130dea376
The Android Open-Source Project [Thu, 16 Jun 2011 18:14:09 +0000 (11:14 -0700)]
merge from tools_r12
Change-Id: Ic2a9844fe74da7c873c7264e38d50d568f190530
Xavier Ducrohet [Thu, 16 Jun 2011 18:00:49 +0000 (11:00 -0700)]
Merge "Merge
bc434d73 from master to r12. do not merge." into tools_r12
Xavier Ducrohet [Wed, 15 Jun 2011 23:22:12 +0000 (16:22 -0700)]
Merge
bc434d73 from master to r12. do not merge.
Add cpu.model to AVD running armeabi-v7a system images.
Change-Id: I2e94a3bed50936a39eebaffa014427d6ce40983d
Xavier Ducrohet [Thu, 16 Jun 2011 17:55:20 +0000 (10:55 -0700)]
Merge "Add cpu.model to AVD running armeabi-v7a system images."
Xavier Ducrohet [Wed, 15 Jun 2011 23:22:12 +0000 (16:22 -0700)]
Add cpu.model to AVD running armeabi-v7a system images.
Change-Id: I5b97b115ada432e284ad2dd3c69bcf7009677aec
The Android Open-Source Project [Wed, 15 Jun 2011 22:44:40 +0000 (15:44 -0700)]
merge from tools_r12
Change-Id: I60f32f625de3ea932c87747e25366377c07e74a5
Xavier Ducrohet [Wed, 15 Jun 2011 22:32:18 +0000 (15:32 -0700)]
Merge "Merge
df07f53c from master to r12. do not merge." into tools_r12
Bill Napier [Wed, 15 Jun 2011 21:50:21 +0000 (14:50 -0700)]
Merge "Laying out the base for ChimpChat"
Michael Wright [Mon, 13 Jun 2011 16:13:55 +0000 (09:13 -0700)]
Laying out the base for ChimpChat
Change-Id: Ia9ba8bb572e029bf3c838605feae55b2f91f16eb
Xavier Ducrohet [Wed, 15 Jun 2011 01:13:11 +0000 (18:13 -0700)]
Merge
df07f53c from master to r12. do not merge.
Fix parsing of the styleable enum/flag attribute values.
Better handling for hexa value > 0x7FFFFFFF
Change-Id: I1cbbed8f9d3ce9f1b7396e2d34c7bd33dc18e70f
Xavier Ducrohet [Wed, 15 Jun 2011 01:20:38 +0000 (18:20 -0700)]
Merge "Fix parsing of the styleable enum/flag attribute values."
The Android Open-Source Project [Wed, 15 Jun 2011 01:17:07 +0000 (18:17 -0700)]
merge from tools_r12
Change-Id: I51da72204b208742edac5cd6f5c3b708bba13346
Xavier Ducrohet [Wed, 15 Jun 2011 01:16:06 +0000 (18:16 -0700)]
Merge "Merge
756d19df from master to r12. do not merge." into tools_r12
Xavier Ducrohet [Wed, 15 Jun 2011 01:13:11 +0000 (18:13 -0700)]
Fix parsing of the styleable enum/flag attribute values.
Better handling for hexa value > 0x7FFFFFFF
Change-Id: If0c2ed23847a720431bceee95f8b264ceb967e3e
Tor Norbye [Wed, 15 Jun 2011 01:02:47 +0000 (18:02 -0700)]
Merge
756d19df from master to r12. do not merge.
Handle "
ffffffff" in attribute flag values
Change-Id: I1ff6dbf959e2c1ff1b475c5cdcebcd0c73975c01
Xavier Ducrohet [Wed, 15 Jun 2011 01:08:50 +0000 (18:08 -0700)]
Merge "Handle "
ffffffff" in attribute flag values"
Xavier Ducrohet [Wed, 15 Jun 2011 01:02:52 +0000 (18:02 -0700)]
Merge "Merge
9d342967 from master to r12. do not merge." into tools_r12
Tor Norbye [Wed, 15 Jun 2011 01:02:47 +0000 (18:02 -0700)]
Handle "
ffffffff" in attribute flag values
Change-Id: I410fccd9a9970eaa65e114be33a9e576280bb6c9
Xavier Ducrohet [Wed, 15 Jun 2011 00:30:49 +0000 (17:30 -0700)]
Merge
9d342967 from master to r12. do not merge.
Fix broken equals() in new qualifiers.
Change-Id: Id083d11a2941d120ca6fd9438a5a12ed7502ab92
Xavier Ducrohet [Wed, 15 Jun 2011 00:33:24 +0000 (17:33 -0700)]
Merge "Fix broken equals() in new qualifiers."
Xavier Ducrohet [Wed, 15 Jun 2011 00:30:49 +0000 (17:30 -0700)]
Fix broken equals() in new qualifiers.
Change-Id: Ide197a390c3d9de8d4e30a8f99f0a32a6ad2191d
Tor Norbye [Tue, 14 Jun 2011 21:31:27 +0000 (14:31 -0700)]
Merge "Add two more layout actions for linear layouts"
Tor Norbye [Tue, 14 Jun 2011 00:27:48 +0000 (17:27 -0700)]
Add two more layout actions for linear layouts
Add two more actions:
(1) Clear All Weights: This removes all the layout weights in a
layout, and converts and 0-sized views to wrap_content.
(2) Assign All Weight: This adds all the weight in the layout to the
selected view(s) and removes it from the remaining views.
Change-Id: Id2a27299d99f77ef4056b7e1745373d52a9331f7
The Android Open-Source Project [Mon, 13 Jun 2011 23:32:04 +0000 (16:32 -0700)]
merge from tools_r12
Change-Id: I14130e9e2a1f58a8db762b3e2b9a1b249664fa4e
Tor Norbye [Mon, 13 Jun 2011 23:26:28 +0000 (16:26 -0700)]
Merge "When distributing linear layout weights, also set size to 0dp. DO NOT MERGE" into tools_r12
Tor Norbye [Mon, 13 Jun 2011 23:12:07 +0000 (16:12 -0700)]
When distributing linear layout weights, also set size to 0dp. DO NOT MERGE
When you use the layout actions bar "Distribute Weights" in a
LinearLayout, in addition to setting all the weights to the same
nonzero value, also set the size (the height for a vertical linear
layout and the width for a horizontal one) to 0dp, to ensure that the
widgets are all given the same total size rather than sharing the
remaining space evenly.
In addition, when adding new widgets to a LinearLayout, see if all
elements in the linear layout already have nonzero and equal weights,
and if so duplicate this weight value on the new widget as well, and
similarly also duplicate 0dp/0dip/0px if used.
Change-Id: I78d1c5af05a8b8b54e4d1eb0d426ce592bc1fc69
Tor Norbye [Mon, 13 Jun 2011 23:24:15 +0000 (16:24 -0700)]
Merge "When distributing linear layout weights, also set size to 0dp"
Tor Norbye [Mon, 13 Jun 2011 23:12:07 +0000 (16:12 -0700)]
When distributing linear layout weights, also set size to 0dp
When you use the layout actions bar "Distribute Weights" in a
LinearLayout, in addition to setting all the weights to the same
nonzero value, also set the size (the height for a vertical linear
layout and the width for a horizontal one) to 0dp, to ensure that the
widgets are all given the same total size rather than sharing the
remaining space evenly.
In addition, when adding new widgets to a LinearLayout, see if all
elements in the linear layout already have nonzero and equal weights,
and if so duplicate this weight value on the new widget as well, and
similarly also duplicate 0dp/0dip/0px if used.
Change-Id: Iac5284a866b19b27e91666dc62278c63b8dde2bb
The Android Open-Source Project [Mon, 13 Jun 2011 20:58:38 +0000 (13:58 -0700)]
merge from tools_r12
Change-Id: Ic2616b4dccc395eaa8e224c2fa12cbce6fd2f770
Tor Norbye [Mon, 13 Jun 2011 20:56:35 +0000 (13:56 -0700)]
Merge "Update changes.txt for ADT 12" into tools_r12
Tor Norbye [Mon, 13 Jun 2011 20:22:32 +0000 (13:22 -0700)]
Update changes.txt for ADT 12
Change-Id: I12575476e0acf9a053ad849544dfdd6e9ad03f07
The Android Open-Source Project [Mon, 13 Jun 2011 18:42:18 +0000 (11:42 -0700)]
merge from tools_r12
Change-Id: Ib9d187b111a4e9cd69fc3db2b125e7cf021bd9a8
Xavier Ducrohet [Mon, 13 Jun 2011 18:31:14 +0000 (11:31 -0700)]
Merge "Merge
0b95acc1 from master to r12. do not merge." into tools_r12
Tor Norbye [Fri, 10 Jun 2011 00:44:03 +0000 (17:44 -0700)]
Merge
0b95acc1 from master to r12. do not merge.
RelativeLayout: Assign ids dynamically, handle multi-drag, bugs
This CL fixes three issues with the new relative layout interaction:
(1) Assign ids dynamically. Before this changeset you couldn't attach
to a node which does not have an @id attribute, since layout
params need to name the constraint by id.
This changeset changes this such that you can attach to any
arbitrary edge, and when you commit the drag, a unique id is
generated on the fly and assigned to the node.
(2) Handle dragging multiple nodes at the same time. The new
constraints code was unconditionally applying the same constraints
to all the dragged nodes, which meant they ended up on top of each
other. This fixes things such that the first node is assigned the
new constraints, and then all subsequent nodes are attached one
next to the other, in a direction depending on which edge you
attached to (e.g. attaching on the right will arrange the siblings
towards the left out from the edge.)
(3) Fix a bug in the code to detect and prevent cycles.
Change-Id: I3da16903ffac6c34a0d5efee52a87824fb9e04fb
The Android Open-Source Project [Mon, 13 Jun 2011 18:28:02 +0000 (11:28 -0700)]
merge from tools_r12
Change-Id: Ibac37d5ac8a7cea21828865a6681ec2ccf43450c
Xavier Ducrohet [Mon, 13 Jun 2011 18:26:19 +0000 (11:26 -0700)]
Merge "RelativeLayout: Assign ids dynamically, handle multi-drag, bugs"
Xavier Ducrohet [Mon, 13 Jun 2011 18:15:52 +0000 (11:15 -0700)]
Merge "Merge
acdf7441 from master to r12. do not merge." into tools_r12