OSDN Git Service
Android (Google) Code Review [Thu, 17 Dec 2009 21:32:15 +0000 (13:32 -0800)]
Merge change Ib93126c7
* changes:
Correctly read HierarchyViewer's protocol in UTF-8. Bug:
1739385.
Romain Guy [Thu, 17 Dec 2009 21:30:34 +0000 (13:30 -0800)]
Correctly read HierarchyViewer's protocol in UTF-8.
Bug:
1739385.
Xavier Ducrohet [Wed, 16 Dec 2009 23:52:45 +0000 (15:52 -0800)]
am
db1773ef: am
9e2ff906: Prevent project from building before their target data has been loaded.
Merge commit '
db1773ef64e9529b09606c6032c271dbd940921b'
* commit '
db1773ef64e9529b09606c6032c271dbd940921b':
Prevent project from building before their target data has been loaded.
Xavier Ducrohet [Wed, 16 Dec 2009 23:52:37 +0000 (15:52 -0800)]
am
fe13f3d0: am
62ff6d73: Add support for manually uninstalled apk in the launcher
Merge commit '
fe13f3d01651c436fdb3c2d0b6ffc96ce9d68941'
* commit '
fe13f3d01651c436fdb3c2d0b6ffc96ce9d68941':
Add support for manually uninstalled apk in the launcher
Xavier Ducrohet [Wed, 16 Dec 2009 23:47:02 +0000 (15:47 -0800)]
am
9e2ff906: Prevent project from building before their target data has been loaded.
Merge commit '
9e2ff90642669592f832d9f1cb56cc6871d5aaab' into eclair-plus-aosp
* commit '
9e2ff90642669592f832d9f1cb56cc6871d5aaab':
Prevent project from building before their target data has been loaded.
Xavier Ducrohet [Wed, 16 Dec 2009 01:10:13 +0000 (17:10 -0800)]
Prevent project from building before their target data has been loaded.
Projects that attempts to build before their target data has been loaded
are put in a list of project to be recompile upon load completion.
Bug:
2303254
Change-Id: Iad9a652ac5455432b2616334bcc8536e169c2adb
Xavier Ducrohet [Wed, 16 Dec 2009 23:34:58 +0000 (15:34 -0800)]
am
62ff6d73: Add support for manually uninstalled apk in the launcher
Merge commit '
62ff6d73be0f7bbc72eb3e23b02a0b4597144a56' into eclair-plus-aosp
* commit '
62ff6d73be0f7bbc72eb3e23b02a0b4597144a56':
Add support for manually uninstalled apk in the launcher
Xavier Ducrohet [Wed, 16 Dec 2009 02:54:17 +0000 (18:54 -0800)]
Add support for manually uninstalled apk in the launcher
Bug:
2306782
Change-Id: I45eb8b3e61631c0656fb6c4870c7a1c7542a0bca
Xavier Ducrohet [Wed, 16 Dec 2009 01:17:28 +0000 (17:17 -0800)]
am
259ced0b: am
605d6192: Link the "force error on native lib" preferences to the Apkbuilder.
Merge commit '
259ced0bb008ea9a8d0f62c192813b109e8d2b8a'
* commit '
259ced0bb008ea9a8d0f62c192813b109e8d2b8a':
Link the "force error on native lib" preferences to the Apkbuilder.
Xavier Ducrohet [Wed, 16 Dec 2009 01:17:25 +0000 (17:17 -0800)]
Xavier Ducrohet [Wed, 16 Dec 2009 01:13:59 +0000 (17:13 -0800)]
am
605d6192: Link the "force error on native lib" preferences to the Apkbuilder.
Merge commit '
605d61926160af815b113fb98434f3e32cf7d73f' into eclair-plus-aosp
* commit '
605d61926160af815b113fb98434f3e32cf7d73f':
Link the "force error on native lib" preferences to the Apkbuilder.
Xavier Ducrohet [Wed, 16 Dec 2009 01:13:55 +0000 (17:13 -0800)]
am
9a68767a: Cleaned up Markers in ADT.
Merge commit '
9a68767a27170689fd647276cb0b082d192448fd' into eclair-plus-aosp
* commit '
9a68767a27170689fd647276cb0b082d192448fd':
Cleaned up Markers in ADT.
Xavier Ducrohet [Tue, 15 Dec 2009 23:22:06 +0000 (15:22 -0800)]
Link the "force error on native lib" preferences to the Apkbuilder.
Change-Id: I57a812946586d89a1abef4bff70d11985fcacc0e
Raphael [Tue, 15 Dec 2009 23:05:46 +0000 (15:05 -0800)]
am
dcbd3afc: am
2758c672: Merge change I4d043716 into eclair
Merge commit '
dcbd3afc528f1fb803b64e54590acc73d737ea68'
* commit '
dcbd3afc528f1fb803b64e54590acc73d737ea68':
GLE2: Add groovy.jar to ADT and ADT-tests
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:49 +0000 (15:03 -0800)]
am
c2a2b5da: am
783561a1: Merge change Ibf602fbb into eclair
Merge commit '
c2a2b5da3fa2fc2b43175aa5a599509cb6842e6b'
* commit '
c2a2b5da3fa2fc2b43175aa5a599509cb6842e6b':
Fix the combos in the editors on MacOS to trigger event on selection from list.
Xavier Ducrohet [Tue, 15 Dec 2009 22:41:24 +0000 (14:41 -0800)]
Cleaned up Markers in ADT.
New packaging marker specific to packaging error coming from
ApkBuilder. This prevent conflicts with other builders adding
or removing those same markers (which apparently prevent those
markers from appearing if ApkBuilder sets them.
Fixed some conflicts between different version of
BaseProjectHelper.addMarker. Renamed the method markResource
and markProject to make it clearer.
Change-Id: I53663a052e3014fd0bff1757a9ae3d642133689f
Raphael [Tue, 15 Dec 2009 18:29:17 +0000 (10:29 -0800)]
am
2758c672: Merge change I4d043716 into eclair
Merge commit '
2758c672a9d5bb9ef66e4aed5db1183be28b192c' into eclair-plus-aosp
* commit '
2758c672a9d5bb9ef66e4aed5db1183be28b192c':
GLE2: Add groovy.jar to ADT and ADT-tests
Android (Google) Code Review [Tue, 15 Dec 2009 18:26:08 +0000 (10:26 -0800)]
Merge change I4d043716 into eclair
* changes:
GLE2: Add groovy.jar to ADT and ADT-tests
Xavier Ducrohet [Tue, 15 Dec 2009 15:40:27 +0000 (07:40 -0800)]
am
783561a1: Merge change Ibf602fbb into eclair
Merge commit '
783561a1b4f77305ef37f590a6d0950c1b5c5d8d' into eclair-plus-aosp
* commit '
783561a1b4f77305ef37f590a6d0950c1b5c5d8d':
Fix the combos in the editors on MacOS to trigger event on selection from list.
Android Git Automerger [Tue, 15 Dec 2009 08:45:10 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Romain Guy [Tue, 15 Dec 2009 02:54:11 +0000 (18:54 -0800)]
Handle version 3 of the View server.
Raphael [Fri, 11 Dec 2009 00:50:29 +0000 (16:50 -0800)]
GLE2: Add groovy.jar to ADT and ADT-tests
Change-Id: I4d0437161b582ae23c23606a8bfa16b04ae508c0
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
Android (Google) Code Review [Mon, 14 Dec 2009 23:02:23 +0000 (15:02 -0800)]
Merge change Ibf602fbb into eclair
* changes:
Fix the combos in the editors on MacOS to trigger event on selection from list.
Xavier Ducrohet [Mon, 14 Dec 2009 22:48:31 +0000 (14:48 -0800)]
Fix the combos in the editors on MacOS to trigger event on selection from list.
BUG:
2323805
Change-Id: Ibf602fbb92da548254051c15e16526348788d56a
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)
Xavier Ducrohet [Sun, 13 Dec 2009 20:41:07 +0000 (12:41 -0800)]
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)
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.
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)
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.
Raphael [Sat, 12 Dec 2009 23:53:21 +0000 (15:53 -0800)]
am
b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Merge commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b' into eclair-plus-aosp
* commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b':
Fix 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
Xavier Ducrohet [Fri, 11 Dec 2009 23:25:00 +0000 (15:25 -0800)]
am
0335802d: Merge change If49c1e1a into eclair
Merge commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4' into eclair-plus-aosp
* commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4':
Exploded view rendering.
Android (Google) Code Review [Fri, 11 Dec 2009 23:20:51 +0000 (15:20 -0800)]
Merge change If49c1e1a into eclair
* changes:
Exploded 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
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.
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.
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.
Xavier Ducrohet [Fri, 11 Dec 2009 20:16:09 +0000 (12:16 -0800)]
am
a6264bb6: Merge change I772404ad into eclair
Merge commit '
a6264bb62807e0135319336636a2e7516ab96d7a' into eclair-plus-aosp
* commit '
a6264bb62807e0135319336636a2e7516ab96d7a':
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
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.
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
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.
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.
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.
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.
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.
Romain Guy [Fri, 11 Dec 2009 02:53:37 +0000 (18:53 -0800)]
am
eee8b435: Merge change Ib350e6de into eclair
Merge commit '
eee8b435e8f79af82b31a67ff72b327d15fa9391' into eclair-plus-aosp
* commit '
eee8b435e8f79af82b31a67ff72b327d15fa9391':
Fix layoutopt.bat to start layoutopt on Windows.
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.
Romain Guy [Fri, 11 Dec 2009 02:35:48 +0000 (18:35 -0800)]
Fix layoutopt.bat to start layoutopt on Windows.
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.
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.
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.
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.
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.
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.
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.
Xavier Ducrohet [Thu, 10 Dec 2009 23:43:38 +0000 (15:43 -0800)]
am
2a4cdf02: Merge change I21c4911e into eclair
Merge commit '
2a4cdf0279367f510ac555cbef60f14aa9d1f4a3' into eclair-plus-aosp
* commit '
2a4cdf0279367f510ac555cbef60f14aa9d1f4a3':
Update builder to check for native libs in 3rd party jar.
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.
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
Xavier Ducrohet [Thu, 10 Dec 2009 14:58:44 +0000 (06:58 -0800)]
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.
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.
Xavier Ducrohet [Thu, 10 Dec 2009 03:41:28 +0000 (19:41 -0800)]
am
85324345: Merge change I8ce7b882 into eclair
Merge commit '
85324345145c50f9540b3e908236b10a1eb10cca' into eclair-plus-aosp
* commit '
85324345145c50f9540b3e908236b10a1eb10cca':
Update the Eclipse plug-in change files with new updates.
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.
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
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.
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.
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.
Xavier Ducrohet [Wed, 9 Dec 2009 19:21:56 +0000 (11:21 -0800)]
am
1d6f06b4: Add the allocation tracker to the DDMS plug-in.
Merge commit '
1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99' into eclair-plus-aosp
* commit '
1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99':
Add 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
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.
Xavier Ducrohet [Tue, 8 Dec 2009 22:11:26 +0000 (14:11 -0800)]
am
5e8170ac: Merge change I3cc4f3fe into eclair
Merge commit '
5e8170aca82ca20f3c4bb937ef3ef00387bfb131' into eclair-plus-aosp
* commit '
5e8170aca82ca20f3c4bb937ef3ef00387bfb131':
Properly order targets.
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.
Android (Google) Code Review [Tue, 8 Dec 2009 22:08:31 +0000 (14:08 -0800)]
Merge change I3cc4f3fe into eclair
* changes:
Properly order targets.
Raphael [Tue, 8 Dec 2009 21:59:51 +0000 (13:59 -0800)]
am
06b7bf8f: ADT GLE2: Implement Edit > Select All.
Merge commit '
06b7bf8f958e08d3d459720d5a353b29e51de1c6' into eclair-plus-aosp
* commit '
06b7bf8f958e08d3d459720d5a353b29e51de1c6':
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.
Xavier Ducrohet [Tue, 8 Dec 2009 21:52:19 +0000 (13:52 -0800)]
Properly order targets.
Change-Id: I3cc4f3fe39715750b72a89a28b682eb16c3a8c27
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
Xavier Ducrohet [Tue, 8 Dec 2009 21:39:31 +0000 (13:39 -0800)]
am
75689a36: Merge change Iba88d526 into eclair
Merge commit '
75689a36371c763cc0bdb4d51f9f7cf419592493' into eclair-plus-aosp
* commit '
75689a36371c763cc0bdb4d51f9f7cf419592493':
Load the SDK target data dynamically when a project requires it.
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.
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.
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
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
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.
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.
Raphael [Tue, 8 Dec 2009 00:19:43 +0000 (16:19 -0800)]
am
c2a2cf85: Merge change Ic07e0d19 into eclair
Merge commit '
c2a2cf85f8a887e655f710e9bcd84d6e22d1e209' into eclair-plus-aosp
* commit '
c2a2cf85f8a887e655f710e9bcd84d6e22d1e209':
GLE2: fix group toggle & scrollbar in layout palette.
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.
Raphael [Mon, 7 Dec 2009 22:40:55 +0000 (14:40 -0800)]
GLE2: fix group toggle & scrollbar in layout palette.
Change-Id: Ic07e0d19b21434c5f9bf7c0149d1f402e1e5a1bd
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.
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.
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.
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
Xavier Ducrohet [Mon, 7 Dec 2009 19:13:26 +0000 (11:13 -0800)]
am
977214b9: Merge change Iaf2904b2 into eclair
Merge commit '
977214b91d3c58ebddc55f4ac8efda1d7de01a0f' into eclair-plus-aosp
* commit '
977214b91d3c58ebddc55f4ac8efda1d7de01a0f':
AVD Selector now sort AVDs
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
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
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.
Xavier Ducrohet [Sat, 5 Dec 2009 03:21:51 +0000 (19:21 -0800)]
am
a5f61032: Merge change Ia935511f into eclair
Merge commit '
a5f61032390c119fab92e87196ba4680cfc42ee5' into eclair-plus-aosp
* commit '
a5f61032390c119fab92e87196ba4680cfc42ee5':
Update ADT's changes.txt file.
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.
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.
OSDN Git Service
