aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-163-5/+1
| | | | Change-Id: I5412777820c8b0e691d07b10df348a739f92f291
* Merge "ADT: Detect when SDK platforms/addons might have changed."Raphael Moll2012-08-1615-84/+364
|\
| * ADT: Detect when SDK platforms/addons might have changed.Raphael Moll2012-08-1515-84/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new functionality in SdkManager to keep track of the existing platforms/addons folder and detect later whether they might have changed. The check is a quick sanity check done on the presence of the target directory, its last-modified timestamp as well as the one of the source.properties. Whenever an SDK Manager instance updates an existing target or add/removes a new one, a change will be detected. Non-goal: this does not trigger when a user manually modifies the content of a target (e.g. its data files). A method is added in AdtPlugin to reload the SDK if the above method detects the targets have potentially changed. This is then used when there's a user interaction with something that depends on the latest state of the SDK, namely: opening XML files (layout, manifest, etc.) or opening a wizard (AVD manager, new project, new template.) These wizards already register for sdk/target change listeners and are notified asynchronously if the SDK has changed and is refreshed. Change-Id: Ia343c26321c0cb39c28a7c5d570c94e543344401
* | Merge "Create new logging class in the common library."Xavier Ducrohet2012-08-155-2/+310
|\ \
| * | Create new logging class in the common library.Xavier Ducrohet2012-08-155-2/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | The goal is to later migrate all existing code to this new logger and get rid of all our duplicates. Also did a misc fix in AndroidLocation. Change-Id: Ia33a782b57c91b4e3d5fd2c0660e040be11b9cbb
* | | Merge "Remove older gldebugger implementation."Siva Velusamy2012-08-1538-9665/+16
|\ \ \
| * | | Remove older gldebugger implementation.Siva Velusamy2012-08-1438-9665/+16
| | | | | | | | | | | | | | | | Change-Id: I3eff6c3710a7bb642619876a8f3f728e08fead6f
* | | | Merge "gltrace: restore checkbox settings between invocations"Siva Velusamy2012-08-151-10/+10
|\ \ \ \ | |/ / /
| * | | gltrace: restore checkbox settings between invocationsSiva Velusamy2012-08-141-10/+10
| | | | | | | | | | | | | | | | Change-Id: Ic910902519eed907a184f5f808aa2aabaa558fa9
* | | | Merge "gltrace: Skip framebuffers that cannot be retrieved."Siva Velusamy2012-08-151-2/+19
|\ \ \ \ | |/ / /
| * | | gltrace: Skip framebuffers that cannot be retrieved.Siva Velusamy2012-08-141-2/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | Rather than failing to parse the entire file, just ignore the fb image if it can't be parsed. This should allow viewing the rest of the data in the trace except for just the image. Change-Id: I0d875cf45e09a29022b5b9a18d33601bb92225a5
* | | Merge "Add Ant support for UI automation test."Xavier Ducrohet2012-08-159-9/+518
|\ \ \
| * | | Add Ant support for UI automation test.Xavier Ducrohet2012-08-159-9/+518
| | |/ | |/| | | | | | | | | | | | | | | | Also fix a bug in a custom ant task where minSdkVersion and targetApi were swapped. Change-Id: Id9bac802377a04270e76def42eaf6a8fb4b3f874
* | | Merge "Fix manifest for ddms.jar due to refactoring."Xavier Ducrohet2012-08-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix manifest for ddms.jar due to refactoring.Xavier Ducrohet2012-08-151-1/+1
| |/ | | | | | | Change-Id: I41a8414669ba82f6053d2f5b7d582dbf32ba6e72
* | Merge "ADT: run external SDK Manager."Raphael Moll2012-08-142-60/+213
|\ \
| * | ADT: run external SDK Manager.Raphael Moll2012-08-102-60/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user invokes the SdkManagerAction (via the icon toolbar) this now runs the external SDK Manager (instead of the direct Java version). If the SDK isn't set properly, this triggers the SDK check in AdtPlugin. This check tries to display some help to setup the SDK -- typically opening preferences. If for some reason this check were to suggest to run the sdk manager there's a fallback to using the internal version. Also when starting the sdk manager as an external app on windows there's a 2-3 seconds delay before the SDK Manager window appears. To give some feedback to the user that the action is on-going a jface progress dialog is shown that will automatically close 3 seconds later. Change-Id: I1aae5dbc5ede6299fc95f81d8c3a94288861d55c
* | | Merge "ADT should not export ant packages."Siva Velusamy2012-08-141-4/+0
|\ \ \
| * | | ADT should not export ant packages.Siva Velusamy2012-08-141-4/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes a build error of form: A cycle was detected when generating the classpath com.android.ide.eclipse.adt, org.eclipse.jdt, com.android.ide.eclipse.adt because JDT will import ant packages that are assumed to come from ADT Change-Id: Ieb2a512faa7438b6923db3df6148557f34eff63a
* | | Merge "Do not export swt menubar internal package."Siva Velusamy2012-08-141-1/+0
|\ \ \
| * | | Do not export swt menubar internal package.Siva Velusamy2012-08-141-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | It is only available on Darwin, so this will cause an error on other platforms. Change-Id: Ibbc219a4b9af9da11b9db4c9222aa382e81c0041
* | | Merge "Integrate uiautomatorviewer into Eclipse"Siva Velusamy2012-08-1414-158/+558
|\ \ \ | |/ / |/| |
| * | Integrate uiautomatorviewer into EclipseSiva Velusamy2012-08-1414-158/+558
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL integrates uiautomatorviewer into Eclipse. There are two components to this: 1. Take UI Hierarchy Dump from a device: This is added as an action to the device view in the DDMS perspective. 2. Viewing the resulting UI hierarchy: This is added as an editor, associated with the .uix extension. The editor simply wraps a UiAutomatorView. The UiAutomatorView is modified slightly to allow for opening just the hierarchy file without the associated screenshot. This is to enable opening the .uix file via standard Eclipse Open File Dialog. When opened this way, the canvas displaying the screenshot is replaced with a button that allows the user to specify the actual screenshot to be displayed. Change-Id: I0f31fe95b2728123ff6f0f748478c18c0c2f1b48
* | Merge "monitor: Remove incorrect escape character."Siva Velusamy2012-08-141-1/+1
|\ \
| * | monitor: Remove incorrect escape character.Siva Velusamy2012-08-141-1/+1
| | | | | | | | | | | | Change-Id: I09b4bb213e81afc30b61d388e7a8e3d7e636ed65
* | | Merge "uiautomator: Build, Release for SDK"Siva Velusamy2012-08-145-9/+79
|\ \ \ | |/ /
| * | uiautomator: Build, Release for SDKSiva Velusamy2012-08-145-9/+79
|/ / | | | | | | Change-Id: Iec38ea5ff95c47da77b9deccda807251d8cd608f
* | Merge "Fix build."Xavier Ducrohet2012-08-134-5/+4
|\ \
| * | Fix build.Xavier Ducrohet2012-08-134-5/+4
|/ / | | | | | | | | | | For some reason "make sdk" doesn't build uiautomatorviewer? Change-Id: Ie390b8c517d4e5da1fbc9b13f56bf60812efecba
* | Merge "More refactoring."Xavier Ducrohet2012-08-13253-664/+398
|\ \
| * | More refactoring.Xavier Ducrohet2012-08-13253-664/+398
|/ / | | | | | | | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* | Merge "Fixed "Bus error" running tests triangleV2 and triangleCM"Andrew Hsieh2012-08-122-6/+14
|\ \ | |/ |/|
| * Fixed "Bus error" running tests triangleV2 and triangleCMAndrew Hsieh2012-08-102-6/+14
| | | | | | | | | | | | | | | | | | | | Function __dyld_func_lookup is deprecated and invisible in Mac SDK 10.6+. Instruct linker to resolve it at run-time. Related CL https://android-review.googlesource.com/#/c/37355/ fix the build, but cause run-time "Bus error". Change-Id: Icf3ea7a0b8ac29c69482e372f34e0b2e364472d8
* | Merge "Load devices defined in tools"Michael Wright2012-08-101-0/+9
|\ \
| * | Load devices defined in toolsMichael Wright2012-08-101-0/+9
| | | | | | | | | | | | Change-Id: Ib40dada5062e755b48bd3a62514ede14cef5ec1e
* | | Merge "Update devices.xml shipped with tools"Michael Wright2012-08-101-426/+381
|\ \ \ | |/ /
| * | Update devices.xml shipped with toolsMichael Wright2012-08-101-426/+381
| | | | | | | | | | | | | | | | | | | | | | | | Rather than containing the generic devices which are now packaged with ADT itself, it contains the nexus devices using the new device specification. Change-Id: I09b38b8166ba558800c2cf03150d8a3e9dd33a4f
* | | Merge "Fix build."Roman Nurik2012-08-101-1/+1
|\ \ \
| * | | Fix build.Roman Nurik2012-08-101-1/+1
|/ / / | | | | | | | | | | | | | | | Broken by Ic5992773207c92426a9f37409536d74b81dd645b Change-Id: Ifd19f71c1ebfa1a3aaf8f812eccbadaee27c8f90
* | | Merge "Disable padding for action bar icons created from clipart."Roman Nurik2012-08-102-2/+8
|\ \ \ | |/ / |/| |
| * | Disable padding for action bar icons created from clipart.Roman Nurik2012-08-082-2/+8
| | | | | | | | | | | | | | | | | | | | | This disables the automatic padding (target rectangle) used by the asset studio when using clipart as the source image. Change-Id: Ic5992773207c92426a9f37409536d74b81dd645b
* | | Merge "Force device list updates in the GLE to happen on the UI thread"Michael Wright2012-08-101-8/+17
|\ \ \
| * | | Force device list updates in the GLE to happen on the UI threadMichael Wright2012-08-091-8/+17
| | | | | | | | | | | | | | | | Change-Id: Ia9624f02c0ca62891b2c35c7d6bfe78130141e1b
* | | | Merge "Set default scaled screen size to device's screen size"Michael Wright2012-08-103-6/+34
|\ \ \ \ | |/ / /
| * | | Set default scaled screen size to device's screen sizeMichael Wright2012-08-093-6/+34
| | | | | | | | | | | | | | | | Change-Id: I6b169f0ef21d8f45da35dd10a7f76b30f3defcbb
* | | | Merge "Make AVDs repairable when the base device changes or is deleted"Michael Wright2012-08-1014-67/+250
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Make AVDs repairable when the base device changes or is deletedMichael Wright2012-08-0914-67/+250
|/ / | | | | | | Change-Id: I3b931ee511dc157320ca8658fe421fe28a1ff387
* | Merge "hv: Add more logging for when things go wrong."Siva Velusamy2012-08-092-0/+4
|\ \
| * | hv: Add more logging for when things go wrong.Siva Velusamy2012-08-092-0/+4
| | | | | | | | | | | | Change-Id: Idbb0a32507c19aadb11544342d73e1be7d1d4272
* | | Merge "Recommend java.lang.Math instead of android.util.FloatMath"Tor Norbye2012-08-094-65/+56
|\ \ \