summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update SdkManagerUpgradeTest to be aware of repo-11.xml" into ↵gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2studio-1.3-releasestudio-1.3-devTor Norbye2015-06-021-0/+4
|\ | | | | | | studio-1.3-dev
| * Update SdkManagerUpgradeTest to be aware of repo-11.xmlTor Norbye2015-06-021-0/+4
|/ | | | Change-Id: I39df0ad34b6cc8c8b80b3fd976cc714ab147d419
* Merge "Fix test that assumed that previews were disabled by default" into ↵gradle_1.3.0-beta1studio-1.4-releaseSiva Velusamy2015-05-211-1/+4
|\ | | | | | | studio-1.3-dev
| * Fix test that assumed that previews were disabled by defaultSiva Velusamy2015-05-211-1/+4
|/ | | | Change-Id: I7d6578914b2d32b65599921dba40b064ba3770ee
* Merge "android.bat: copy gson.jar to tmp folder while running" into ↵Siva Velusamy2015-05-091-0/+1
|\ | | | | | | studio-1.3-dev
| * android.bat: copy gson.jar to tmp folder while runningSiva Velusamy2015-05-081-0/+1
|/ | | | | | gson is now a dependency required by sdkmanager Change-Id: I053fdfce227345581bde400ef232e2b665a001f9
* Merge "Fix gson dependency in IDEA project files." into studio-1.3-devXavier Ducrohet2015-05-051-3/+3
|\
| * Fix gson dependency in IDEA project files.Xavier Ducrohet2015-05-041-3/+3
|/ | | | Change-Id: Iadb5ab0988b3c79b026f843d41fd744faf47a9c1
* Merge "Add gson library" into studio-1.3-devSiva Velusamy2015-05-041-0/+11
|\
| * Add gson librarySiva Velusamy2015-05-041-0/+11
|/ | | | Change-Id: If8ee65e73a7a2c01834bd37fd1809eb01780b2f0
* Merge "update sdkmanager main to match new API." into studio-1.3-devXavier Ducrohet2015-05-011-5/+6
|\
| * update sdkmanager main to match new API.Xavier Ducrohet2015-04-211-5/+6
|/ | | | Change-Id: Iffd6cd8ae74ef9c75bcd82ed9f3d72a90e925117
* Merge "Adopting refactoring from 145321" into studio-1.3-devJoe Baker-Malone2015-04-063-3/+3
|\
| * Adopting refactoring from 145321Joe Baker-Malone2015-04-063-3/+3
| | | | | | | | | | | | | | | | Some classes were moved in https://android-review.googlesource.com/145321. Updating references accordingly. Change-Id: Ia085f1aeddb974b86de4649aafc2ff84c3b9b830
* | Merge "Fix project structure." into studio-1.3-devDeepanshu Gupta2015-04-064-3/+14
|\ \ | |/ |/|
| * Fix project structure.Deepanshu Gupta2015-04-064-3/+14
|/ | | | | | e0033629 missed some dependencies. Change-Id: I76d46cc13666220d769f55ab332a1464444438dc
* Merge "Switch to using layoutlib-api-base.iml" into studio-1.3-devDeepanshu Gupta2015-04-041-2/+2
|\
| * Switch to using layoutlib-api-base.imlDeepanshu Gupta2015-04-041-2/+2
|/ | | | Change-Id: I4122f10ef3ada76424680a3934dacbafd7356886
* Merge "Add JUnit4 library definition to IDEA" into studio-1.3-devSiva Velusamy2015-03-111-0/+11
|\
| * Add JUnit4 library definition to IDEASiva Velusamy2015-03-111-0/+11
|/ | | | Change-Id: Ie961c8ababd86a87054b29b6b0956d50aebb0cff
* Merge "Fixing breakage caused by 121088" into studio-1.1-devgradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0studio-1.2-releasestudio-1.2-devstudio-1.1-releasestudio-1.1-devJoe Baker-Malone2015-01-021-1/+1
|\
| * Fixing breakage caused by 121088Joe Baker-Malone2015-01-021-1/+1
|/ | | | | | | AvdInfo.isRunning() was moved to AvdManager, but there was a reference left over. Change-Id: Ifb8b531603376856e92c2df578e84efd53eaa1fc
* Merge "82983: Update SDK Download SSL URLs in Android SDK Tools & Android ↵Tor Norbye2014-12-203-242/+37
|\ | | | | | | Studio" into studio-1.1-dev
| * 82983: Update SDK Download SSL URLs in Android SDK Tools & Android StudioTor Norbye2014-12-193-242/+37
|/ | | | | | | Also update project metadata files to reflect recent changes (IJ 14 and separate annotations module) Change-Id: I5a22a4649d075f98676c996e93a8eabdf2d4d8d8
* Merge "Fix eclipse .classpath files" into studio-1.1-devSiva Velusamy2014-12-162-1/+2
|\
| * Fix eclipse .classpath filesSiva Velusamy2014-12-162-1/+2
|/ | | | Change-Id: I55330df7cad69b6377142aec93661f3b59dca437
* Merge "Chimpchat: use shell timeout from DdmPreferences instead of ↵studio-1.0-devXavier Ducrohet2014-12-021-3/+2
|\ | | | | | | hardcoding" into studio-1.0-dev
| * Chimpchat: use shell timeout from DdmPreferences instead of hardcodingVojtech Bocek2014-12-021-3/+2
|/ | | | Change-Id: I452c54caa6f87a4763be29c42478488225f50250
* Merge "Enabling cmd.exe extensions for android.bat" into studio-1.0-devXavier Ducrohet2014-11-211-1/+1
|\
| * Enabling cmd.exe extensions for android.batDavid Herman2014-11-201-1/+1
|/ | | | | | | | | | | | | | | | | | | Since Windows XP (at least?), cmd.exe has a bunch of extensions that are enabled on Windows by default. However, some systems can disable this globally in the registry. In that case, our android.bat file will fail to run, because it relies on extended features. The solution is to explicitly turn on extensions via the setlocal command, so at least it's turned on for our script. Most users won't be affected by this (because they should already have extensions turned on by default), but for the few users who have disabled it for whatever reason, this will fix their case. Otherwise, we'd just break with strange, unrelated failures. https://code.google.com/p/android/issues/detail?id=78654 Change-Id: Ib5d651fbc7243c6b91f68b76d9da39f3a8445211
* Merge "Fixing NPE when creating new device in old AVD manager" into ↵gradle_0.14.4gradle_0.14.3gradle_0.14.2gradle_0.14.1gradle_0.14.0Joe Baker-Malone2014-10-201-3/+5
|\ | | | | | | studio-1.0-dev
| * Fixing NPE when creating new device in old AVD managerJoe Baker-Malone2014-10-161-3/+5
| | | | | | | | | | fixes https://code.google.com/p/android/issues/detail?id=73648 Change-Id: I939458751f8944ced1b40a0e9be8065d5600a749
* | Merge "Update unit tests for SWT-based SDK manager with new devices" into ↵Tor Norbye2014-10-192-45/+63
|\ \ | |/ |/| | | studio-1.0-dev
| * Update unit tests for SWT-based SDK manager with new devicesTor Norbye2014-10-192-45/+63
|/ | | | Change-Id: I518fa5a42570f814d6d1a60660e7e608c7c8bb7a
* Merge "AVD Manager: no longer provide addon's base target sys-img." into ↵Raphael Moll2014-10-101-3/+9
|\ | | | | | | studio-1.0-dev
| * AVD Manager: no longer provide addon's base target sys-img.Raphael Moll2014-10-101-3/+9
|/ | | | | | | | | | | When an add-on did not provide any system image, the AVD Manager behavior was to automatically provide the parent platform's system image instead. The new behavior is to not provide any system image and consequently the user cannot create an AVD using such an add-on. Change-Id: Id5e27c3e7c6d57bccba6cb318e1f318f4b5c356e (cherry picked from commit 222fa2d5b0f59baef96360affabc84656accb7c6)
* Merge "Added a "Dump Theme" option to expose all resources." into idea133ub-tools-idea133-releaseSiva Velusamy2014-09-199-1/+371
|\
| * Added a "Dump Theme" option to expose all resources.Jon Miranda2014-09-199-1/+371
|/ | | | | | | | | | Dump Theme retrieves all the resources associated with a selected ViewNode and then displays it in a table. + The table can be filtered down via a text field. + Added DDM support. Change-Id: I36ed0e693afcceba0a1d33d0156654ba868f5d02
* Merge "Add support for 64 bit native dumps." into idea133Siva Velusamy2014-09-126-18/+62
|\
| * Add support for 64 bit native dumps.Christopher Ferris2014-09-116-18/+62
|/ | | | | Bug: 17319589 Change-Id: I388836777c905bea5efd9e42846f96b19dd751f8
* Merge "Remove bouncy castle (unused) library definition" into idea133Siva Velusamy2014-09-041-13/+0
|\
| * Remove bouncy castle (unused) library definitionSiva Velusamy2014-09-031-13/+0
| | | | | | | | Change-Id: I4579eac2e695992e86d8b3f3e54db1aa23a8596e
* | Merge "Add Trove4J library definition" into idea133Siva Velusamy2014-09-041-0/+12
|\|
| * Add Trove4J library definitionSiva Velusamy2014-09-031-0/+12
|/ | | | Change-Id: I77e2d7ad5aaa256ad0e0f213d72e5d55f7615097
* Merge "Removed "get" prefix and "()" suffix from property name labels." into ↵gradle_0.13.3gradle_0.13.2gradle_0.13.1gradle_0.13.0Siva Velusamy2014-08-192-6/+76
|\ | | | | | | idea133
| * Removed "get" prefix and "()" suffix from property name labels.Jon Miranda2014-07-292-6/+76
| | | | | | | | | | | | | | | | Ensures that "get" is only removed when it is the first three letters of the property name—except when the label is "get" itself; "()" is only removed when it is the last two letters. Change-Id: I2922050054d97b73bb3c219891b59f6c31d0df97
* | Merge "Skip duplicates devices" into idea133Deepanshu Gupta2014-08-155-4/+9
|\ \
| * | Skip duplicates devicesDeepanshu Gupta2014-08-145-4/+9
| | | | | | | | | | | | | | | | | | | | | This also adds testutils module to the intellij project to fix the project setup. Change-Id: I40bb9a8b457a3e12309d28f4f8c386e1f51c0efc
* | | Merge "Minor: Update intelliiJ config files." into idea133Deepanshu Gupta2014-08-155-2/+5
|\ \ \ | |/ / |/| |
| * | Minor: Update intelliiJ config files.Deepanshu Gupta2014-08-145-2/+5
|/ / | | | | | | | | | | | | IntelliJ automatically added coverage information to runconfigurations and removed newlines from library xmls. Change-Id: Ifd340005d1727c040cad1e2db5ebb59a2a12a1c9
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-13 03:00:00 +0000