aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 56529beb: am 5426e998: am 0335802d: Merge change If49c1e1a into eclairXavier Ducrohet2009-12-1310-63/+553
|\ | | | | | | | | | | | | Merge commit '56529beb404221336be8d236cb0d91a1faddbd53' * commit '56529beb404221336be8d236cb0d91a1faddbd53': Exploded view rendering.
| * am 5426e998: am 0335802d: Merge change If49c1e1a into eclairXavier Ducrohet2009-12-1310-63/+553
| |\ | | | | | | | | | | | | | | | | | | Merge commit '5426e9986c166b001a5d4d4407d7fa70b6c50f79' into eclair-mr2-plus-aosp * commit '5426e9986c166b001a5d4d4407d7fa70b6c50f79': Exploded view rendering.
| | * am 0335802d: Merge change If49c1e1a into eclairXavier Ducrohet2009-12-1310-63/+553
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0335802d77e3eb36ab9aa07946d66d6dd8e309d4' into eclair-mr2 * commit '0335802d77e3eb36ab9aa07946d66d6dd8e309d4': Exploded view rendering.
| | | * Merge change If49c1e1a into eclairAndroid (Google) Code Review2009-12-1110-63/+553
| | | |\ | | | | | | | | | | | | | | | | | | | | * changes: Exploded view rendering.
| | | | * Exploded view rendering.Xavier Ducrohet2009-12-1110-63/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | am 9792d6b3: am e3be459d: am a6264bb6: Merge change I772404ad into eclairXavier Ducrohet2009-12-111-1/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9792d6b37f63e3fd4071867ddb4e34aef4927258' * commit '9792d6b37f63e3fd4071867ddb4e34aef4927258': Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
| * | | | am e3be459d: am a6264bb6: Merge change I772404ad into eclairXavier Ducrohet2009-12-111-1/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e3be459db85a46699d5ce2229b2e4af6d6a92ae9' into eclair-mr2-plus-aosp * commit 'e3be459db85a46699d5ce2229b2e4af6d6a92ae9': Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
| | * | | am a6264bb6: Merge change I772404ad into eclairXavier Ducrohet2009-12-111-1/+19
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a6264bb62807e0135319336636a2e7516ab96d7a' into eclair-mr2 * commit 'a6264bb62807e0135319336636a2e7516ab96d7a': Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
| | | * | Merge change I772404ad into eclairAndroid (Google) Code Review2009-12-111-1/+19
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
| | | | * | Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.Xavier Ducrohet2009-12-111-1/+19
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I772404ad500462da94ba243ebc4f7c26ea2a267a
* | | | | am ac2ab013: am cbba60af: am eee8b435: Merge change Ib350e6de into eclairRomain Guy2009-12-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ac2ab01365fb1b6635cbd4b2c15a8bc43b2909ea' * commit 'ac2ab01365fb1b6635cbd4b2c15a8bc43b2909ea': Fix layoutopt.bat to start layoutopt on Windows.
| * | | | am cbba60af: am eee8b435: Merge change Ib350e6de into eclairRomain Guy2009-12-101-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cbba60af7db2e5e3faf768550e015b1f94808743' into eclair-mr2-plus-aosp * commit 'cbba60af7db2e5e3faf768550e015b1f94808743': Fix layoutopt.bat to start layoutopt on Windows.
| | * | | am eee8b435: Merge change Ib350e6de into eclairRomain Guy2009-12-101-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'eee8b435e8f79af82b31a67ff72b327d15fa9391' into eclair-mr2 * commit 'eee8b435e8f79af82b31a67ff72b327d15fa9391': Fix layoutopt.bat to start layoutopt on Windows.
| | | * | Merge change Ib350e6de into eclairAndroid (Google) Code Review2009-12-101-1/+1
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | * changes: Fix layoutopt.bat to start layoutopt on Windows.
| | | | * Fix layoutopt.bat to start layoutopt on Windows.Romain Guy2009-12-101-1/+1
| | | | |
* | | | | am 23d75b7e: am 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclairXavier Ducrohet2009-12-1019-358/+416
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '23d75b7edf737affada7d86eaf0f16e368caebc7' * commit '23d75b7edf737affada7d86eaf0f16e368caebc7': Update builder to check for native libs in 3rd party jar.
| * | | | am 65c8d1a4: am 2a4cdf02: Merge change I21c4911e into eclairXavier Ducrohet2009-12-1019-358/+416
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '65c8d1a4390fefe7a8eea0383bbfa696d6f31acf' into eclair-mr2-plus-aosp * commit '65c8d1a4390fefe7a8eea0383bbfa696d6f31acf': Update builder to check for native libs in 3rd party jar.
| | * | | am 2a4cdf02: Merge change I21c4911e into eclairXavier Ducrohet2009-12-1019-358/+416
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2a4cdf0279367f510ac555cbef60f14aa9d1f4a3' into eclair-mr2 * commit '2a4cdf0279367f510ac555cbef60f14aa9d1f4a3': Update builder to check for native libs in 3rd party jar.
| | | * | Merge change I21c4911e into eclairAndroid (Google) Code Review2009-12-1019-358/+416
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update builder to check for native libs in 3rd party jar.
| | | | * | Update builder to check for native libs in 3rd party jar.Xavier Ducrohet2009-12-1019-358/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | am c45d6b44: am 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclairXavier Ducrohet2009-12-101-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c45d6b44c2fa5f9971f2d68eebe7175fce1dadb5' * commit 'c45d6b44c2fa5f9971f2d68eebe7175fce1dadb5': Update the Eclipse plug-in change files with new updates.
| * | | | | am 5ef7bc6e: am 85324345: Merge change I8ce7b882 into eclairXavier Ducrohet2009-12-101-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5ef7bc6ed3580de2e1183dc1fc6af2930aa6f11a' into eclair-mr2-plus-aosp * commit '5ef7bc6ed3580de2e1183dc1fc6af2930aa6f11a': Update the Eclipse plug-in change files with new updates.
| | * | | | am 85324345: Merge change I8ce7b882 into eclairXavier Ducrohet2009-12-101-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '85324345145c50f9540b3e908236b10a1eb10cca' into eclair-mr2 * commit '85324345145c50f9540b3e908236b10a1eb10cca': Update the Eclipse plug-in change files with new updates.
| | | * | | Merge change I8ce7b882 into eclairAndroid (Google) Code Review2009-12-091-1/+2
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * changes: Update the Eclipse plug-in change files with new updates.
| | | | * | Update the Eclipse plug-in change files with new updates.Xavier Ducrohet2009-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ce7b882fd72b9d3d517210cafeef5d9dadbf33c
* | | | | | am 13f27ae0: am 635604fc: am 1d6f06b4: Add the allocation tracker to the ↵Xavier Ducrohet2009-12-103-0/+57
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DDMS plug-in. Merge commit '13f27ae0f0d479374d07f1f6a98a98827975d4c6' * commit '13f27ae0f0d479374d07f1f6a98a98827975d4c6': Add the allocation tracker to the DDMS plug-in.
| * | | | | am 635604fc: am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.Xavier Ducrohet2009-12-103-0/+57
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '635604fc1c0278a7de0a7353cf8014a07c4290cd' into eclair-mr2-plus-aosp * commit '635604fc1c0278a7de0a7353cf8014a07c4290cd': Add the allocation tracker to the DDMS plug-in.
| | * | | | am 1d6f06b4: Add the allocation tracker to the DDMS plug-in.Xavier Ducrohet2009-12-103-0/+57
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99' into eclair-mr2 * commit '1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99': Add the allocation tracker to the DDMS plug-in.
| | | * | | Add the allocation tracker to the DDMS plug-in.Xavier Ducrohet2009-12-083-0/+57
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I294d92046fccdba71ba1b2ab4280014a7722e65e
* | | | | am f2996530: am aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclairXavier Ducrohet2009-12-101-0/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f2996530aa60709c7606b5af7bbf674f87acd99a' * commit 'f2996530aa60709c7606b5af7bbf674f87acd99a': Properly order targets.
| * | | | am aa01c48f: am 5e8170ac: Merge change I3cc4f3fe into eclairXavier Ducrohet2009-12-091-0/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa01c48f8398694bd17b6edbbca6519fdc1b5a0b' into eclair-mr2-plus-aosp * commit 'aa01c48f8398694bd17b6edbbca6519fdc1b5a0b': Properly order targets.
| | * | | am 5e8170ac: Merge change I3cc4f3fe into eclairXavier Ducrohet2009-12-081-0/+11
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5e8170aca82ca20f3c4bb937ef3ef00387bfb131' into eclair-mr2 * commit '5e8170aca82ca20f3c4bb937ef3ef00387bfb131': Properly order targets.
| | | * | Merge change I3cc4f3fe into eclairAndroid (Google) Code Review2009-12-081-0/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Properly order targets.
| | | | * | Properly order targets.Xavier Ducrohet2009-12-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cc4f3fe39715750b72a89a28b682eb16c3a8c27
* | | | | | am 331cf71b: am 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.Raphael2009-12-103-11/+141
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '331cf71b259bbada6dccd24c85b5ff35fa6d3681' * commit '331cf71b259bbada6dccd24c85b5ff35fa6d3681': ADT GLE2: Implement Edit > Select All.
| * | | | | am 3e2d37c1: am 06b7bf8f: ADT GLE2: Implement Edit > Select All.Raphael2009-12-093-11/+141
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3e2d37c1f45988e0ea363981acd276cefe05344b' into eclair-mr2-plus-aosp * commit '3e2d37c1f45988e0ea363981acd276cefe05344b': ADT GLE2: Implement Edit > Select All.
| | * | | | am 06b7bf8f: ADT GLE2: Implement Edit > Select All.Raphael2009-12-083-11/+141
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '06b7bf8f958e08d3d459720d5a353b29e51de1c6' into eclair-mr2 * commit '06b7bf8f958e08d3d459720d5a353b29e51de1c6': ADT GLE2: Implement Edit > Select All.
| | | * | | ADT GLE2: Implement Edit > Select All.Raphael2009-12-083-11/+141
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Also wires copy/paste/cut even though they are not used yet. Change-Id: I265566bd5f4a612f03e9919bd34d47869006b7b6
* | | | | am af913dce: am 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclairXavier Ducrohet2009-12-1014-149/+286
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'af913dceb633177ba3332da8fb4544807e9be1e5' * commit 'af913dceb633177ba3332da8fb4544807e9be1e5': Load the SDK target data dynamically when a project requires it.
| * | | | am 8d0ea2c2: am 75689a36: Merge change Iba88d526 into eclairXavier Ducrohet2009-12-0914-149/+286
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8d0ea2c2e808860b85dd135634caafb5f3c2cc33' into eclair-mr2-plus-aosp * commit '8d0ea2c2e808860b85dd135634caafb5f3c2cc33': Load the SDK target data dynamically when a project requires it.
| | * | | am 75689a36: Merge change Iba88d526 into eclairXavier Ducrohet2009-12-0814-149/+286
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '75689a36371c763cc0bdb4d51f9f7cf419592493' into eclair-mr2 * commit '75689a36371c763cc0bdb4d51f9f7cf419592493': Load the SDK target data dynamically when a project requires it.
| | | * | Merge change Iba88d526 into eclairAndroid (Google) Code Review2009-12-0814-149/+286
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Load the SDK target data dynamically when a project requires it.
| | | | * | Load the SDK target data dynamically when a project requires it.Xavier Ducrohet2009-12-0714-149/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG 2303254 Change-Id: Iba88d526f50218bb57c41109ca1777bad441bb00
* | | | | | am 1da37c2b: am 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclairRaphael2009-12-081-29/+84
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1da37c2b3d8e858e1814e129ad83e1d2768ffb83' * commit '1da37c2b3d8e858e1814e129ad83e1d2768ffb83': GLE2: fix group toggle & scrollbar in layout palette.
| * | | | | am 57ca4e72: am c2a2cf85: Merge change Ic07e0d19 into eclairRaphael2009-12-071-29/+84
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '57ca4e72eb3cb853b32478014e9be54c487cb4d4' into eclair-mr2-plus-aosp * commit '57ca4e72eb3cb853b32478014e9be54c487cb4d4': GLE2: fix group toggle & scrollbar in layout palette.
| | * | | | am c2a2cf85: Merge change Ic07e0d19 into eclairRaphael2009-12-071-29/+84
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c2a2cf85f8a887e655f710e9bcd84d6e22d1e209' into eclair-mr2 * commit 'c2a2cf85f8a887e655f710e9bcd84d6e22d1e209': GLE2: fix group toggle & scrollbar in layout palette.
| | | * | | Merge change Ic07e0d19 into eclairAndroid (Google) Code Review2009-12-071-29/+84
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * changes: GLE2: fix group toggle & scrollbar in layout palette.
| | | | * | GLE2: fix group toggle & scrollbar in layout palette.Raphael2009-12-071-29/+84
| | | | |/ | | | | | | | | | | | | | | | Change-Id: Ic07e0d19b21434c5f9bf7c0149d1f402e1e5a1bd
* | | | | am 09a80e52: am 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclairXavier Ducrohet2009-12-075-33/+108
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '09a80e525c9fbf296992396632bfaa4566924f01' * commit '09a80e525c9fbf296992396632bfaa4566924f01': AVD Selector now sort AVDs
| * | | | am 6f2761e1: am 977214b9: Merge change Iaf2904b2 into eclairXavier Ducrohet2009-12-075-33/+108
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6f2761e1ba9137a6ac389381ba1f2b5d70ba1c94' into eclair-mr2-plus-aosp * commit '6f2761e1ba9137a6ac389381ba1f2b5d70ba1c94': AVD Selector now sort AVDs