OSDN Git Service

android-x86/sdk.git
14 years agoHandle version 3 of the View server.
Romain Guy [Tue, 15 Dec 2009 02:54:11 +0000 (18:54 -0800)]
Handle version 3 of the View server.

14 years agoFixes crash in HierarchyViewer when windows hash code exceed int capacity.
Romain Guy [Mon, 14 Dec 2009 23:32:31 +0000 (15:32 -0800)]
Fixes crash in HierarchyViewer when windows hash code exceed int capacity.
Bug: 2321018

14 years agoam 023c25de: am f12e7eb7: am b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Raphael [Sun, 13 Dec 2009 20:41:11 +0000 (12:41 -0800)]
am 023c25de: am f12e7eb7: am b8cc9f36: Fix ADT Tests (see Change If49c1e1a)

Merge commit '023c25de5f7dbf0b2286b03be78f0f34238d590e'

* commit '023c25de5f7dbf0b2286b03be78f0f34238d590e':
  Fix ADT Tests (see Change If49c1e1a)

14 years agoam 56529beb: am 5426e998: am 0335802d: Merge change If49c1e1a into eclair
Xavier Ducrohet [Sun, 13 Dec 2009 20:41:07 +0000 (12:41 -0800)]
am 56529beb: am 5426e998: am 0335802d: Merge change If49c1e1a into eclair

Merge commit '56529beb404221336be8d236cb0d91a1faddbd53'

* commit '56529beb404221336be8d236cb0d91a1faddbd53':
  Exploded view rendering.

14 years agoam f12e7eb7: am b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Raphael [Sun, 13 Dec 2009 20:33:49 +0000 (12:33 -0800)]
am f12e7eb7: am b8cc9f36: Fix ADT Tests (see Change If49c1e1a)

Merge commit 'f12e7eb7df6f5ef3135a969ad77682a5dbe24329' into eclair-mr2-plus-aosp

* commit 'f12e7eb7df6f5ef3135a969ad77682a5dbe24329':
  Fix ADT Tests (see Change If49c1e1a)

14 years agoam 5426e998: am 0335802d: Merge change If49c1e1a into eclair
Xavier Ducrohet [Sun, 13 Dec 2009 20:33:43 +0000 (12:33 -0800)]
am 5426e998: am 0335802d: Merge change If49c1e1a into eclair

Merge commit '5426e9986c166b001a5d4d4407d7fa70b6c50f79' into eclair-mr2-plus-aosp

* commit '5426e9986c166b001a5d4d4407d7fa70b6c50f79':
  Exploded view rendering.

14 years agoam b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Raphael [Sun, 13 Dec 2009 20:26:15 +0000 (12:26 -0800)]
am b8cc9f36: Fix ADT Tests (see Change If49c1e1a)

Merge commit 'b8cc9f3659c467afb6da36e11a9cda2c57479e0b' into eclair-mr2

* commit 'b8cc9f3659c467afb6da36e11a9cda2c57479e0b':
  Fix ADT Tests (see Change If49c1e1a)

14 years agoam 0335802d: Merge change If49c1e1a into eclair
Xavier Ducrohet [Sun, 13 Dec 2009 20:24:35 +0000 (12:24 -0800)]
am 0335802d: Merge change If49c1e1a into eclair

Merge commit '0335802d77e3eb36ab9aa07946d66d6dd8e309d4' into eclair-mr2

* commit '0335802d77e3eb36ab9aa07946d66d6dd8e309d4':
  Exploded view rendering.

14 years agoFix ADT Tests (see Change If49c1e1a)
Raphael [Sat, 12 Dec 2009 05:33:24 +0000 (21:33 -0800)]
Fix ADT Tests (see Change If49c1e1a)

Change-Id: Ief3c7bf7fddc6a91fb1c00b5cffcc7778b12815b

14 years agoMerge change If49c1e1a into eclair
Android (Google) Code Review [Fri, 11 Dec 2009 23:20:51 +0000 (15:20 -0800)]
Merge change If49c1e1a into eclair

* changes:
  Exploded view rendering.

14 years agoExploded view rendering.
Xavier Ducrohet [Fri, 11 Dec 2009 03:48:39 +0000 (19:48 -0800)]
Exploded view rendering.

- Override padding values on layout when sent to the layoutlib rendering.
  Either set a 10px padding, or add 10px to the current padding (resolving
  values in dip, sp, pt, in, mm)

- Screen size is increased to match the new padding. this is a work
  in progress and a lot of logic for each layout still needs to be done

- Display a white outline for the exploded layouts in the GLE1.
  GLE2 support to come.

All of this is currently on the same toggle as the clipped rendering.
Need to add a new toggle button for it (and map it to a key shortcut)

Change-Id: If49c1e1a07923aeeca9dbc76f978afff2d106b51

14 years agoam 9792d6b3: am e3be459d: am a6264bb6: Merge change I772404ad into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 20:21:57 +0000 (12:21 -0800)]
am 9792d6b3: am e3be459d: am a6264bb6: Merge change I772404ad into eclair

Merge commit '9792d6b37f63e3fd4071867ddb4e34aef4927258'

* commit '9792d6b37f63e3fd4071867ddb4e34aef4927258':
  Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.

14 years agoam e3be459d: am a6264bb6: Merge change I772404ad into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 20:18:32 +0000 (12:18 -0800)]
am e3be459d: am a6264bb6: Merge change I772404ad into eclair

Merge commit 'e3be459db85a46699d5ce2229b2e4af6d6a92ae9' into eclair-mr2-plus-aosp

* commit 'e3be459db85a46699d5ce2229b2e4af6d6a92ae9':
  Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.

14 years agoam a6264bb6: Merge change I772404ad into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 20:16:47 +0000 (12:16 -0800)]
am a6264bb6: Merge change I772404ad into eclair

Merge commit 'a6264bb62807e0135319336636a2e7516ab96d7a' into eclair-mr2

* commit 'a6264bb62807e0135319336636a2e7516ab96d7a':
  Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.

14 years agoMerge change I772404ad into eclair
Android (Google) Code Review [Fri, 11 Dec 2009 20:12:07 +0000 (12:12 -0800)]
Merge change I772404ad into eclair

* changes:
  Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.

14 years agoFix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Xavier Ducrohet [Fri, 11 Dec 2009 19:21:44 +0000 (11:21 -0800)]
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.

Change-Id: I772404ad500462da94ba243ebc4f7c26ea2a267a

14 years agoam ac2ab013: am cbba60af: am eee8b435: Merge change Ib350e6de into eclair
Romain Guy [Fri, 11 Dec 2009 09:39:40 +0000 (01:39 -0800)]
am ac2ab013: am cbba60af: am eee8b435: Merge change Ib350e6de into eclair

Merge commit 'ac2ab01365fb1b6635cbd4b2c15a8bc43b2909ea'

* commit 'ac2ab01365fb1b6635cbd4b2c15a8bc43b2909ea':
  Fix layoutopt.bat to start layoutopt on Windows.

14 years agoam 23d75b7e: am 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 07:44:56 +0000 (23:44 -0800)]
am 23d75b7e: am 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclair

Merge commit '23d75b7edf737affada7d86eaf0f16e368caebc7'

* commit '23d75b7edf737affada7d86eaf0f16e368caebc7':
  Update builder to check for native libs in 3rd party jar.

14 years agoam c45d6b44: am 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 07:44:53 +0000 (23:44 -0800)]
am c45d6b44: am 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclair

Merge commit 'c45d6b44c2fa5f9971f2d68eebe7175fce1dadb5'

* commit 'c45d6b44c2fa5f9971f2d68eebe7175fce1dadb5':
  Update the Eclipse plug-in change files with new updates.

14 years agoam cbba60af: am eee8b435: Merge change Ib350e6de into eclair
Romain Guy [Fri, 11 Dec 2009 03:55:37 +0000 (19:55 -0800)]
am cbba60af: am eee8b435: Merge change Ib350e6de into eclair

Merge commit 'cbba60af7db2e5e3faf768550e015b1f94808743' into eclair-mr2-plus-aosp

* commit 'cbba60af7db2e5e3faf768550e015b1f94808743':
  Fix layoutopt.bat to start layoutopt on Windows.

14 years agoam eee8b435: Merge change Ib350e6de into eclair
Romain Guy [Fri, 11 Dec 2009 03:49:26 +0000 (19:49 -0800)]
am eee8b435: Merge change Ib350e6de into eclair

Merge commit 'eee8b435e8f79af82b31a67ff72b327d15fa9391' into eclair-mr2

* commit 'eee8b435e8f79af82b31a67ff72b327d15fa9391':
  Fix layoutopt.bat to start layoutopt on Windows.

14 years agoMerge change Ib350e6de into eclair
Android (Google) Code Review [Fri, 11 Dec 2009 02:49:14 +0000 (18:49 -0800)]
Merge change Ib350e6de into eclair

* changes:
  Fix layoutopt.bat to start layoutopt on Windows.

14 years agoFix layoutopt.bat to start layoutopt on Windows.
Romain Guy [Fri, 11 Dec 2009 02:35:48 +0000 (18:35 -0800)]
Fix layoutopt.bat to start layoutopt on Windows.

14 years agoam 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 02:07:31 +0000 (18:07 -0800)]
am 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclair

Merge commit '65c8d1a4390fefe7a8eea0383bbfa696d6f31acf' into eclair-mr2-plus-aosp

* commit '65c8d1a4390fefe7a8eea0383bbfa696d6f31acf':
  Update builder to check for native libs in 3rd party jar.

14 years agoam 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 02:07:27 +0000 (18:07 -0800)]
am 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclair

Merge commit '5ef7bc6ed3580de2e1183dc1fc6af2930aa6f11a' into eclair-mr2-plus-aosp

* commit '5ef7bc6ed3580de2e1183dc1fc6af2930aa6f11a':
  Update the Eclipse plug-in change files with new updates.

14 years agoam 2a4cdf02: Merge change I21c4911e into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 02:01:11 +0000 (18:01 -0800)]
am 2a4cdf02: Merge change I21c4911e into eclair

Merge commit '2a4cdf0279367f510ac555cbef60f14aa9d1f4a3' into eclair-mr2

* commit '2a4cdf0279367f510ac555cbef60f14aa9d1f4a3':
  Update builder to check for native libs in 3rd party jar.

14 years agoam 85324345: Merge change I8ce7b882 into eclair
Xavier Ducrohet [Fri, 11 Dec 2009 01:56:55 +0000 (17:56 -0800)]
am 85324345: Merge change I8ce7b882 into eclair

Merge commit '85324345145c50f9540b3e908236b10a1eb10cca' into eclair-mr2

* commit '85324345145c50f9540b3e908236b10a1eb10cca':
  Update the Eclipse plug-in change files with new updates.

14 years agoam 13f27ae0: am 635604fc: am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.
Xavier Ducrohet [Fri, 11 Dec 2009 01:14:02 +0000 (17:14 -0800)]
am 13f27ae0: am 635604fc: am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.

Merge commit '13f27ae0f0d479374d07f1f6a98a98827975d4c6'

* commit '13f27ae0f0d479374d07f1f6a98a98827975d4c6':
  Add the allocation tracker to the DDMS plug-in.

14 years agoam 635604fc: am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.
Xavier Ducrohet [Fri, 11 Dec 2009 00:58:02 +0000 (16:58 -0800)]
am 635604fc: am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.

Merge commit '635604fc1c0278a7de0a7353cf8014a07c4290cd' into eclair-mr2-plus-aosp

* commit '635604fc1c0278a7de0a7353cf8014a07c4290cd':
  Add the allocation tracker to the DDMS plug-in.

14 years agoam 1d6f06b4: Add the allocation tracker to the DDMS plug-in.
Xavier Ducrohet [Fri, 11 Dec 2009 00:45:32 +0000 (16:45 -0800)]
am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.

Merge commit '1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99' into eclair-mr2

* commit '1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99':
  Add the allocation tracker to the DDMS plug-in.

14 years agoMerge change I21c4911e into eclair
Android (Google) Code Review [Thu, 10 Dec 2009 23:39:29 +0000 (15:39 -0800)]
Merge change I21c4911e into eclair

* changes:
  Update builder to check for native libs in 3rd party jar.

14 years agoUpdate builder to check for native libs in 3rd party jar.
Xavier Ducrohet [Thu, 10 Dec 2009 23:01:16 +0000 (15:01 -0800)]
Update builder to check for native libs in 3rd party jar.

- Apkbuilder now look for .jnilib / .so libs in 3rd party jars files
  and complain if any are found
- preferences to set error/warning on libraries that don't interfer with
  NDK native lib path

- refactoring of the Preferences into AdtPrefs as too much was getting
  in AdtPlugin. Merged the PreferenceInitializer into AdtPrefs.

- merged AdtConstants and AndroidConstants, as there were remnants of
  the common/adt/editor merge.

- Looks like there are issues with some markers. I did some changes
  but I'll clean it up in the next commit.

BUG 2242132

Change-Id: I21c4911e9c8bd32fcff17a7788b37d920b7acbf5

14 years agoam f2996530: am aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclair
Xavier Ducrohet [Thu, 10 Dec 2009 14:58:44 +0000 (06:58 -0800)]
am f2996530: am aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclair

Merge commit 'f2996530aa60709c7606b5af7bbf674f87acd99a'

* commit 'f2996530aa60709c7606b5af7bbf674f87acd99a':
  Properly order targets.

14 years agoam 331cf71b: am 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.
Raphael [Thu, 10 Dec 2009 14:58:40 +0000 (06:58 -0800)]
am 331cf71b: am 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.

Merge commit '331cf71b259bbada6dccd24c85b5ff35fa6d3681'

* commit '331cf71b259bbada6dccd24c85b5ff35fa6d3681':
  ADT GLE2: Implement Edit > Select All.

14 years agoam af913dce: am 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclair
Xavier Ducrohet [Thu, 10 Dec 2009 14:58:36 +0000 (06:58 -0800)]
am af913dce: am 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclair

Merge commit 'af913dceb633177ba3332da8fb4544807e9be1e5'

* commit 'af913dceb633177ba3332da8fb4544807e9be1e5':
  Load the SDK target data dynamically when a project requires it.

14 years agoMerge change I8ce7b882 into eclair
Android (Google) Code Review [Thu, 10 Dec 2009 03:39:49 +0000 (19:39 -0800)]
Merge change I8ce7b882 into eclair

* changes:
  Update the Eclipse plug-in change files with new updates.

14 years agoUpdate the Eclipse plug-in change files with new updates.
Xavier Ducrohet [Wed, 9 Dec 2009 00:05:19 +0000 (16:05 -0800)]
Update the Eclipse plug-in change files with new updates.

Change-Id: I8ce7b882fd72b9d3d517210cafeef5d9dadbf33c

14 years agoam aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclair
Xavier Ducrohet [Wed, 9 Dec 2009 23:52:12 +0000 (15:52 -0800)]
am aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclair

Merge commit 'aa01c48f8398694bd17b6edbbca6519fdc1b5a0b' into eclair-mr2-plus-aosp

* commit 'aa01c48f8398694bd17b6edbbca6519fdc1b5a0b':
  Properly order targets.

14 years agoam 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.
Raphael [Wed, 9 Dec 2009 23:52:02 +0000 (15:52 -0800)]
am 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.

Merge commit '3e2d37c1f45988e0ea363981acd276cefe05344b' into eclair-mr2-plus-aosp

* commit '3e2d37c1f45988e0ea363981acd276cefe05344b':
  ADT GLE2: Implement Edit > Select All.

14 years agoam 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclair
Xavier Ducrohet [Wed, 9 Dec 2009 23:51:00 +0000 (15:51 -0800)]
am 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclair

Merge commit '8d0ea2c2e808860b85dd135634caafb5f3c2cc33' into eclair-mr2-plus-aosp

* commit '8d0ea2c2e808860b85dd135634caafb5f3c2cc33':
  Load the SDK target data dynamically when a project requires it.

14 years agoAdd the allocation tracker to the DDMS plug-in.
Xavier Ducrohet [Tue, 8 Dec 2009 23:27:43 +0000 (15:27 -0800)]
Add the allocation tracker to the DDMS plug-in.

Change-Id: I294d92046fccdba71ba1b2ab4280014a7722e65e

14 years agoam 1da37c2b: am 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclair
Raphael [Tue, 8 Dec 2009 22:51:21 +0000 (14:51 -0800)]
am 1da37c2b: am 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclair

Merge commit '1da37c2b3d8e858e1814e129ad83e1d2768ffb83'

* commit '1da37c2b3d8e858e1814e129ad83e1d2768ffb83':
  GLE2: fix group toggle & scrollbar in layout palette.

14 years agoam 5e8170ac: Merge change I3cc4f3fe into eclair
Xavier Ducrohet [Tue, 8 Dec 2009 22:11:25 +0000 (14:11 -0800)]
am 5e8170ac: Merge change I3cc4f3fe into eclair

Merge commit '5e8170aca82ca20f3c4bb937ef3ef00387bfb131' into eclair-mr2

* commit '5e8170aca82ca20f3c4bb937ef3ef00387bfb131':
  Properly order targets.

14 years agoMerge change I3cc4f3fe into eclair
Android (Google) Code Review [Tue, 8 Dec 2009 22:08:31 +0000 (14:08 -0800)]
Merge change I3cc4f3fe into eclair

* changes:
  Properly order targets.

14 years agoam 06b7bf8f: ADT GLE2: Implement Edit > Select All.
Raphael [Tue, 8 Dec 2009 21:59:44 +0000 (13:59 -0800)]
am 06b7bf8f: ADT GLE2: Implement Edit > Select All.

Merge commit '06b7bf8f958e08d3d459720d5a353b29e51de1c6' into eclair-mr2

* commit '06b7bf8f958e08d3d459720d5a353b29e51de1c6':
  ADT GLE2: Implement Edit > Select All.

14 years agoProperly order targets.
Xavier Ducrohet [Tue, 8 Dec 2009 21:52:19 +0000 (13:52 -0800)]
Properly order targets.

Change-Id: I3cc4f3fe39715750b72a89a28b682eb16c3a8c27

14 years agoADT GLE2: Implement Edit > Select All.
Raphael [Tue, 8 Dec 2009 21:17:15 +0000 (13:17 -0800)]
ADT GLE2: Implement Edit > Select All.

Also wires copy/paste/cut even though they are not used yet.

Change-Id: I265566bd5f4a612f03e9919bd34d47869006b7b6

14 years agoam 75689a36: Merge change Iba88d526 into eclair
Xavier Ducrohet [Tue, 8 Dec 2009 21:39:20 +0000 (13:39 -0800)]
am 75689a36: Merge change Iba88d526 into eclair

Merge commit '75689a36371c763cc0bdb4d51f9f7cf419592493' into eclair-mr2

* commit '75689a36371c763cc0bdb4d51f9f7cf419592493':
  Load the SDK target data dynamically when a project requires it.

14 years agoMerge change Iba88d526 into eclair
Android (Google) Code Review [Tue, 8 Dec 2009 21:36:06 +0000 (13:36 -0800)]
Merge change Iba88d526 into eclair

* changes:
  Load the SDK target data dynamically when a project requires it.

14 years agoLoad the SDK target data dynamically when a project requires it.
Xavier Ducrohet [Tue, 8 Dec 2009 02:41:34 +0000 (18:41 -0800)]
Load the SDK target data dynamically when a project requires it.

BUG 2303254

Change-Id: Iba88d526f50218bb57c41109ca1777bad441bb00

14 years agoam 09a80e52: am 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclair
Xavier Ducrohet [Tue, 8 Dec 2009 02:34:26 +0000 (18:34 -0800)]
am 09a80e52: am 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclair

Merge commit '09a80e525c9fbf296992396632bfaa4566924f01'

* commit '09a80e525c9fbf296992396632bfaa4566924f01':
  AVD Selector now sort AVDs

14 years agoam 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclair
Raphael [Tue, 8 Dec 2009 00:21:57 +0000 (16:21 -0800)]
am 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclair

Merge commit '57ca4e72eb3cb853b32478014e9be54c487cb4d4' into eclair-mr2-plus-aosp

* commit '57ca4e72eb3cb853b32478014e9be54c487cb4d4':
  GLE2: fix group toggle & scrollbar in layout palette.

14 years agoam c2a2cf85: Merge change Ic07e0d19 into eclair
Raphael [Tue, 8 Dec 2009 00:20:25 +0000 (16:20 -0800)]
am c2a2cf85: Merge change Ic07e0d19 into eclair

Merge commit 'c2a2cf85f8a887e655f710e9bcd84d6e22d1e209' into eclair-mr2

* commit 'c2a2cf85f8a887e655f710e9bcd84d6e22d1e209':
  GLE2: fix group toggle & scrollbar in layout palette.

14 years agoMerge change Ic07e0d19 into eclair
Android (Google) Code Review [Tue, 8 Dec 2009 00:16:46 +0000 (16:16 -0800)]
Merge change Ic07e0d19 into eclair

* changes:
  GLE2: fix group toggle & scrollbar in layout palette.

14 years agoGLE2: fix group toggle & scrollbar in layout palette.
Raphael [Mon, 7 Dec 2009 22:40:55 +0000 (14:40 -0800)]
GLE2: fix group toggle & scrollbar in layout palette.

Change-Id: Ic07e0d19b21434c5f9bf7c0149d1f402e1e5a1bd

14 years agoam 3b9a3a2c: am 4906940b: am a5f61032: Merge change Ia935511f into eclair
Xavier Ducrohet [Mon, 7 Dec 2009 22:57:38 +0000 (14:57 -0800)]
am 3b9a3a2c: am 4906940b: am a5f61032: Merge change Ia935511f into eclair

Merge commit '3b9a3a2cdb7e6c0d7c211945e515c3f60457a4e3'

* commit '3b9a3a2cdb7e6c0d7c211945e515c3f60457a4e3':
  Update ADT's changes.txt file.

14 years agoam cc03669f: am efa9af7c: am 33b62060: Listen to default.properties change from outsi...
Xavier Ducrohet [Mon, 7 Dec 2009 22:57:33 +0000 (14:57 -0800)]
am cc03669f: am efa9af7c: am 33b62060: Listen to default.properties change from outside of ADT and update the project.

Merge commit 'cc03669f97b7ba31a1933cb828db593603ca251c'

* commit 'cc03669f97b7ba31a1933cb828db593603ca251c':
  Listen to default.properties change from outside of ADT and update the project.

14 years agoam 30406ced: am f459c53d: am 4e278588: Make the SDK stat opt-out dialog not interfer...
Xavier Ducrohet [Mon, 7 Dec 2009 22:56:05 +0000 (14:56 -0800)]
am 30406ced: am f459c53d: am 4e278588: Make the SDK stat opt-out dialog not interfer with other modal dialogs.

Merge commit '30406ced7a74f4ba6b267cd04667897be67dbc42'

* commit '30406ced7a74f4ba6b267cd04667897be67dbc42':
  Make the SDK stat opt-out dialog not interfer with other modal dialogs.

14 years agoam 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclair
Xavier Ducrohet [Mon, 7 Dec 2009 19:15:06 +0000 (11:15 -0800)]
am 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclair

Merge commit '6f2761e1ba9137a6ac389381ba1f2b5d70ba1c94' into eclair-mr2-plus-aosp

* commit '6f2761e1ba9137a6ac389381ba1f2b5d70ba1c94':
  AVD Selector now sort AVDs

14 years agoam 977214b9: Merge change Iaf2904b2 into eclair
Xavier Ducrohet [Mon, 7 Dec 2009 19:13:04 +0000 (11:13 -0800)]
am 977214b9: Merge change Iaf2904b2 into eclair

Merge commit '977214b91d3c58ebddc55f4ac8efda1d7de01a0f' into eclair-mr2

* commit '977214b91d3c58ebddc55f4ac8efda1d7de01a0f':
  AVD Selector now sort AVDs

14 years agoMerge change Iaf2904b2 into eclair
Android (Google) Code Review [Mon, 7 Dec 2009 19:09:36 +0000 (11:09 -0800)]
Merge change Iaf2904b2 into eclair

* changes:
  AVD Selector now sort AVDs

14 years agoam 4906940b: am a5f61032: Merge change Ia935511f into eclair
Xavier Ducrohet [Sat, 5 Dec 2009 03:23:59 +0000 (19:23 -0800)]
am 4906940b: am a5f61032: Merge change Ia935511f into eclair

Merge commit '4906940bf5a14d083b82f071f68ca3a72041ebea' into eclair-mr2-plus-aosp

* commit '4906940bf5a14d083b82f071f68ca3a72041ebea':
  Update ADT's changes.txt file.

14 years agoam a5f61032: Merge change Ia935511f into eclair
Xavier Ducrohet [Sat, 5 Dec 2009 03:21:32 +0000 (19:21 -0800)]
am a5f61032: Merge change Ia935511f into eclair

Merge commit 'a5f61032390c119fab92e87196ba4680cfc42ee5' into eclair-mr2

* commit 'a5f61032390c119fab92e87196ba4680cfc42ee5':
  Update ADT's changes.txt file.

14 years agoam efa9af7c: am 33b62060: Listen to default.properties change from outside of ADT...
Xavier Ducrohet [Sat, 5 Dec 2009 03:19:28 +0000 (19:19 -0800)]
am efa9af7c: am 33b62060: Listen to default.properties change from outside of ADT and update the project.

Merge commit 'efa9af7c954fa5459ff5049366dde5454f8a7633' into eclair-mr2-plus-aosp

* commit 'efa9af7c954fa5459ff5049366dde5454f8a7633':
  Listen to default.properties change from outside of ADT and update the project.

14 years agoMerge change Ia935511f into eclair
Android (Google) Code Review [Sat, 5 Dec 2009 03:19:16 +0000 (19:19 -0800)]
Merge change Ia935511f into eclair

* changes:
  Update ADT's changes.txt file.

14 years agoam 33b62060: Listen to default.properties change from outside of ADT and update the...
Xavier Ducrohet [Sat, 5 Dec 2009 03:18:07 +0000 (19:18 -0800)]
am 33b62060: Listen to default.properties change from outside of ADT and update the project.

Merge commit '33b62060beacbdf05ebbbfbb15b90365f005081f' into eclair-mr2

* commit '33b62060beacbdf05ebbbfbb15b90365f005081f':
  Listen to default.properties change from outside of ADT and update the project.

14 years agoUpdate ADT's changes.txt file.
Xavier Ducrohet [Sat, 5 Dec 2009 01:55:30 +0000 (17:55 -0800)]
Update ADT's changes.txt file.

14 years agoAVD Selector now sort AVDs
Xavier Ducrohet [Sat, 5 Dec 2009 03:07:02 +0000 (19:07 -0800)]
AVD Selector now sort AVDs

Also fixed the IAndroidTarget comparison to sort first by revision
and then per platform or addon and then per vendor/name (for add-ons)

BUG 2302823

14 years agoListen to default.properties change from outside of ADT and update the project.
Xavier Ducrohet [Sat, 5 Dec 2009 01:33:21 +0000 (17:33 -0800)]
Listen to default.properties change from outside of ADT and update the project.

BUG 2287591

14 years agoam f459c53d: am 4e278588: Make the SDK stat opt-out dialog not interfer with other...
Xavier Ducrohet [Sat, 5 Dec 2009 00:30:10 +0000 (16:30 -0800)]
am f459c53d: am 4e278588: Make the SDK stat opt-out dialog not interfer with other modal dialogs.

Merge commit 'f459c53dd73012ac4ba738fb88e3c8671a9154dc' into eclair-mr2-plus-aosp

* commit 'f459c53dd73012ac4ba738fb88e3c8671a9154dc':
  Make the SDK stat opt-out dialog not interfer with other modal dialogs.

14 years agoam 4e278588: Make the SDK stat opt-out dialog not interfer with other modal dialogs.
Xavier Ducrohet [Sat, 5 Dec 2009 00:28:28 +0000 (16:28 -0800)]
am 4e278588: Make the SDK stat opt-out dialog not interfer with other modal dialogs.

Merge commit '4e278588e789280a94e84215813a0e0ec4fe75fd' into eclair-mr2

* commit '4e278588e789280a94e84215813a0e0ec4fe75fd':
  Make the SDK stat opt-out dialog not interfer with other modal dialogs.

14 years agoMake the SDK stat opt-out dialog not interfer with other modal dialogs.
Xavier Ducrohet [Fri, 4 Dec 2009 22:47:40 +0000 (14:47 -0800)]
Make the SDK stat opt-out dialog not interfer with other modal dialogs.

BUG 2305986

14 years agoam 8e85989b: am 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout...
Xavier Ducrohet [Fri, 4 Dec 2009 12:31:41 +0000 (04:31 -0800)]
am 8e85989b: am 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout Editor.

Merge commit '8e85989b5220618946b965291accad08ee63546b'

* commit '8e85989b5220618946b965291accad08ee63546b':
  Add a new device to devices.xml for the Layout Editor.

14 years agoam 9634e2b4: am f1ec3b32: am 9f68a08a: Remove files that have been moved into develop...
Xavier Ducrohet [Fri, 4 Dec 2009 12:24:51 +0000 (04:24 -0800)]
am 9634e2b4: am f1ec3b32: am 9f68a08a: Remove files that have been moved into development.git

Merge commit '9634e2b499862c1b5e52c4784b55c6e84f0084fa'

* commit '9634e2b499862c1b5e52c4784b55c6e84f0084fa':
  Remove files that have been moved into development.git

14 years agoam 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Fri, 4 Dec 2009 02:24:48 +0000 (18:24 -0800)]
am 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout Editor.

Merge commit '32767f584f7e0538c2f4c640337d12bf92492d0a' into eclair-mr2-plus-aosp

* commit '32767f584f7e0538c2f4c640337d12bf92492d0a':
  Add a new device to devices.xml for the Layout Editor.

14 years agoam 178b6d4a: Add a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Fri, 4 Dec 2009 02:19:43 +0000 (18:19 -0800)]
am 178b6d4a: Add a new device to devices.xml for the Layout Editor.

Merge commit '178b6d4a5600300dd31b9bfd9f98cd4e959c6544' into eclair-mr2

* commit '178b6d4a5600300dd31b9bfd9f98cd4e959c6544':
  Add a new device to devices.xml for the Layout Editor.

14 years agoam f1ec3b32: am 9f68a08a: Remove files that have been moved into development.git
Xavier Ducrohet [Fri, 4 Dec 2009 00:34:38 +0000 (16:34 -0800)]
am f1ec3b32: am 9f68a08a: Remove files that have been moved into development.git

Merge commit 'f1ec3b3280229d22f9e5a79b43d226fe08822dc6' into eclair-mr2-plus-aosp

* commit 'f1ec3b3280229d22f9e5a79b43d226fe08822dc6':
  Remove files that have been moved into development.git

14 years agoAdd a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Thu, 3 Dec 2009 22:54:32 +0000 (14:54 -0800)]
Add a new device to devices.xml for the Layout Editor.

BUG 2296284

14 years agoam 9f68a08a: Remove files that have been moved into development.git
Xavier Ducrohet [Thu, 3 Dec 2009 19:53:33 +0000 (11:53 -0800)]
am 9f68a08a: Remove files that have been moved into development.git

Merge commit '9f68a08a1d6a740e26f02e339a67c166cc83f1db' into eclair-mr2

* commit '9f68a08a1d6a740e26f02e339a67c166cc83f1db':
  Remove files that have been moved into development.git

14 years agoam 44d6d86f: am 31a4ba7c: am 40134607: Merge change I79854c45 into eclair
Xavier Ducrohet [Thu, 3 Dec 2009 04:38:31 +0000 (20:38 -0800)]
am 44d6d86f: am 31a4ba7c: am 40134607: Merge change I79854c45 into eclair

Merge commit '44d6d86fbeea1918ce4767f950bac3c756a0523b'

* commit '44d6d86fbeea1918ce4767f950bac3c756a0523b':
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoam 2b7afc57: am 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair
Xavier Ducrohet [Thu, 3 Dec 2009 04:36:54 +0000 (20:36 -0800)]
am 2b7afc57: am 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair

Merge commit '2b7afc57d2c863a65730e54b1ee66ae586eefdef'

* commit '2b7afc57d2c863a65730e54b1ee66ae586eefdef':
  Clean up the content of scripts/ folder.

14 years agoam 3c4812ab: am 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have...
Xavier Ducrohet [Thu, 3 Dec 2009 04:31:25 +0000 (20:31 -0800)]
am 3c4812ab: am 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.

Merge commit '3c4812abff0685f998fbebeb5649547b1d2222b4'

* commit '3c4812abff0685f998fbebeb5649547b1d2222b4':
  Fix a possible NPE when add-ons don't have optional APIs.

14 years agoRemove files that have been moved into development.git
Xavier Ducrohet [Thu, 3 Dec 2009 03:10:44 +0000 (19:10 -0800)]
Remove files that have been moved into development.git

14 years agoam 31a4ba7c: am 40134607: Merge change I79854c45 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:53:16 +0000 (13:53 -0800)]
am 31a4ba7c: am 40134607: Merge change I79854c45 into eclair

Merge commit '31a4ba7c73f620c395dd9206e35f4dec099405dd' into eclair-mr2-plus-aosp

* commit '31a4ba7c73f620c395dd9206e35f4dec099405dd':
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoam 40134607: Merge change I79854c45 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:50:14 +0000 (13:50 -0800)]
am 40134607: Merge change I79854c45 into eclair

Merge commit '4013460709a66ea2cb1816faa99b3700f4760264' into eclair-mr2

* commit '4013460709a66ea2cb1816faa99b3700f4760264':
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoMerge change I79854c45 into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 21:44:59 +0000 (13:44 -0800)]
Merge change I79854c45 into eclair

* changes:
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoEnforce 9+ MB sdcard size when creating AVDs.
Xavier Ducrohet [Wed, 2 Dec 2009 21:01:51 +0000 (13:01 -0800)]
Enforce 9+ MB sdcard size when creating AVDs.

BUG 2296337

14 years agoam 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:02 +0000 (13:05 -0800)]
am 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair

Merge commit '4ae961f9d100d03a1b42c1304fae18cd935fe7b2' into eclair-mr2-plus-aosp

* commit '4ae961f9d100d03a1b42c1304fae18cd935fe7b2':
  Clean up the content of scripts/ folder.

14 years agoam 5acbc909: Merge change Iaa970a49 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:01:57 +0000 (13:01 -0800)]
am 5acbc909: Merge change Iaa970a49 into eclair

Merge commit '5acbc90908dab4ac981c5a1e9577cb16c03fd394' into eclair-mr2

* commit '5acbc90908dab4ac981c5a1e9577cb16c03fd394':
  Clean up the content of scripts/ folder.

14 years agoMerge change Iaa970a49 into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:44 +0000 (12:59 -0800)]
Merge change Iaa970a49 into eclair

* changes:
  Clean up the content of scripts/ folder.

14 years agoam 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.
Xavier Ducrohet [Wed, 2 Dec 2009 19:06:28 +0000 (11:06 -0800)]
am 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.

Merge commit '44b6f0e7427f256de5af72eff120115d6aee8188' into eclair-mr2-plus-aosp

* commit '44b6f0e7427f256de5af72eff120115d6aee8188':
  Fix a possible NPE when add-ons don't have optional APIs.

14 years agoam 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.
Xavier Ducrohet [Wed, 2 Dec 2009 19:03:13 +0000 (11:03 -0800)]
am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.

Merge commit '0cf765337d75539a42fb2ff1a635e2ad34c6446e' into eclair-mr2

* commit '0cf765337d75539a42fb2ff1a635e2ad34c6446e':
  Fix a possible NPE when add-ons don't have optional APIs.

14 years agoam a14ed802: am a4e82ce0: am f200375d: ADT GLE2: palette view with drag\'n\'drop...
Raphael [Wed, 2 Dec 2009 01:39:15 +0000 (17:39 -0800)]
am a14ed802: am a4e82ce0: am f200375d: ADT GLE2: palette view with drag\'n\'drop source.

Merge commit 'a14ed8029b122146089033c0c2da0625112ce601'

* commit 'a14ed8029b122146089033c0c2da0625112ce601':
  ADT GLE2: palette view with drag'n'drop source.

14 years agoam a4e82ce0: am f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Raphael [Wed, 2 Dec 2009 01:29:34 +0000 (17:29 -0800)]
am a4e82ce0: am f200375d: ADT GLE2: palette view with drag\'n\'drop source.

Merge commit 'a4e82ce0dcbecf3190122f25de7f0e535f8d5aff' into eclair-mr2-plus-aosp

* commit 'a4e82ce0dcbecf3190122f25de7f0e535f8d5aff':
  ADT GLE2: palette view with drag'n'drop source.

14 years agoam f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Raphael [Wed, 2 Dec 2009 01:05:46 +0000 (17:05 -0800)]
am f200375d: ADT GLE2: palette view with drag\'n\'drop source.

Merge commit 'f200375d590efd084142d60058ce6c9543a1b9cd' into eclair-mr2

* commit 'f200375d590efd084142d60058ce6c9543a1b9cd':
  ADT GLE2: palette view with drag'n'drop source.

14 years agoFix a possible NPE when add-ons don't have optional APIs.
Xavier Ducrohet [Tue, 1 Dec 2009 22:40:42 +0000 (14:40 -0800)]
Fix a possible NPE when add-ons don't have optional APIs.

BUG 2235023

14 years agoClean up the content of scripts/ folder.
Xavier Ducrohet [Tue, 1 Dec 2009 21:02:31 +0000 (13:02 -0800)]
Clean up the content of scripts/ folder.

- move back some scripts into development/scripts/
- templates for Ant project go in sdk/templates/
- files that are packaged with the sdk go in sdk/files/

14 years agoADT GLE2: palette view with drag'n'drop source.
Raphael [Mon, 30 Nov 2009 19:07:45 +0000 (11:07 -0800)]
ADT GLE2: palette view with drag'n'drop source.

Work in progress.

14 years agoam ecd2adbf: am e0c52b45: am e18bb230: am 109964b3: ADT fix: layout device config...
Raphael [Fri, 20 Nov 2009 21:26:20 +0000 (13:26 -0800)]
am ecd2adbf: am e0c52b45: am e18bb230: am 109964b3: ADT fix: layout device config files can be empty (no devices)

Merge commit 'ecd2adbf804608e7a8e3d04684fb089f92bcc677'

* commit 'ecd2adbf804608e7a8e3d04684fb089f92bcc677':
  ADT fix: layout device config files can be empty (no devices)

14 years agoam e0c52b45: am e18bb230: am 109964b3: ADT fix: layout device config files can be...
Raphael [Fri, 20 Nov 2009 21:24:56 +0000 (13:24 -0800)]
am e0c52b45: am e18bb230: am 109964b3: ADT fix: layout device config files can be empty (no devices)

Merge commit 'e0c52b450f174cdec73ee3851c8923f923ad3a32' into eclair-mr2-plus-aosp

* commit 'e0c52b450f174cdec73ee3851c8923f923ad3a32':
  ADT fix: layout device config files can be empty (no devices)