aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
|\ | | | | | | | | | | | | automerge: 80e3ce8 * commit '80e3ce8bd4f4daf0c64de75f99e0d6bec06cbcba': Move to the new LayoutlibCallback.
| * Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| |\
| | * Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| |/ | | | | | | | | | | | | | | | | LegacyCallback will be removed shortly. The change moves to the new LayoutlibCallback. Also implement the newly added supports() method. Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
* | Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-134-55/+60
|\ \ | |/ | | | | | | | | | | automerge: 2c05810 * commit '2c0581045e20439c54ff5aec76681e4429389f8b': Revert "Add targetPlatform for executable binaries"
| * Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-124-55/+60
| |\
| | * Revert "Add targetPlatform for executable binaries"Xavier Ducrohet2015-02-124-55/+60
| |/ | | | | | | This reverts commit 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.
* | Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
|\ \ | |/ | | | | | | | | | | automerge: f7757fb * commit 'f7757fbc3e2361e3f3dfad355ed5f82397fb55d5': Add targetPlatform for executable binaries
| * Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
| |\
| | * Add targetPlatform for executable binariesRaymond Chiu2015-02-104-60/+55
| |/ | | | | | | | | | | Make dsl changes due to gradle update. Change-Id: I65729783f5c8f985ed31a231e7dd9a0b9e50f7b3
* | Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933Tor Norbye2015-02-051-3/+5
|\ \ | |/ | | | | | | | | | | automerge: e50f48d * commit 'e50f48d93f311c7143a051e2244d68c9f19507c5': pixel perfect: Disable controls
| * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-051-3/+5
| |\ | | | | | | | | | | | | | | | | | | automerge: b234933 * commit 'b234933dc60c7c85db36156b74b6e2c49b2ee9a9': pixel perfect: Disable controls
| | * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-031-3/+5
| | |\
| | | * pixel perfect: Disable controlsSiva Velusamy2015-02-031-3/+5
| | |/ | | | | | | | | | | | | | | | Fix for https://code.google.com/p/android/issues/detail?id=69199 Change-Id: Id90b589dafc02157196e16bbf65beebeb3d57178
* | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into ↵Tor Norbye2015-02-0516-452/+439
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev automerge: 9042534 * commit '9042534a2f70c86840c8594c280594f2c4c916bd': Update Eclipse plugin to handle new LocaleQualifier API
| * | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into ↵Tor Norbye2015-02-0416-452/+439
| |\ \ | | | | | | | | | | | | studio-1.2-dev
| | * | Update Eclipse plugin to handle new LocaleQualifier APITor Norbye2015-02-0416-452/+439
| |/ / | | | | | | | | | Change-Id: I1d5eaec7e6f61a21b07cf790166d9b6ea8f041db
* | | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 2e5634d * commit '2e5634d59af5b7dc367882f6b51d1d23a9c5c794': Remove stale scripts
| * | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
| |\ \
| | * | Remove stale scriptsSiva Velusamy2015-02-0312-1493/+0
| | | | | | | | | | | | | | | | Change-Id: I85fdf33a69cb9adeb1a59d691f3ef92b3bfcd455
* | | | Merge "Add AssetRepository to render params." into studio-1.1-dev automerge: ↵Tor Norbye2015-01-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb34195 automerge: 86647b2 * commit '86647b2b1164eac053e39b4d4296df704da60d5d': Add AssetRepository to render params.
| * | | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-290-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | automerge: bb34195 * commit 'bb341957d6e513fdcb91b8bb1fe665def0a5fe10': Add AssetRepository to render params.
| | * | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-291-0/+4
| | |\ \ | | | |/ | | |/|
| | | * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | By adding the asset repository, we ensure that LayoutLib knows that the IDE doesn't support assets and doesn't log an error. Change-Id: Ie4dd8fecbb358c7977ab0568832d37de81ac256d (cherry picked from commit 4368aeabecbe6356940477ec4fdfaa8d5017e10c)
* | | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 5203a24 * commit '5203a2412ad64c1eb45bfdcd8801baf5dc1727ba': Add AssetRepository to render params.
| * | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
| |\ \ | | |/ | |/|
| | * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | By adding the asset repository, we ensure that LayoutLib knows that the IDE doesn't support assets and doesn't log an error. Change-Id: Ie4dd8fecbb358c7977ab0568832d37de81ac256d
* | | Merge "Track LocaleManager API changes" into studio-1.1-devTor Norbye2015-01-282-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 892f37b * commit '892f37b7b2b59bcb1a83cf415dc378d2a997fc0c': Track LocaleManager API changes
| * | Merge "Track LocaleManager API changes" into studio-1.1-devTor Norbye2015-01-272-3/+4
| |\ \ | | |/ | |/|
| | * Track LocaleManager API changesTor Norbye2015-01-272-3/+4
| |/ | | | | | | Change-Id: Ibc5a6e7b0681848240376b165efa2cf49f0beb37
* | Merge changes I87b5b309,Id23d941c into studio-1.1-devSiva Velusamy2015-01-143-211/+1
|\ \ | |/ | | | | | | | | | | | | automerge: 92eb4b1 * commit '92eb4b169c383a60d87215d9dd83ff9a07a13961': Update adt plugin's manifest to use lombok 0.2.3 Remove obsolete p2gen folder
| * Merge changes I87b5b309,Id23d941c into studio-1.1-devSiva Velusamy2015-01-143-211/+1
| |\ | | | | | | | | | | | | | | | * changes: Update adt plugin's manifest to use lombok 0.2.3 Remove obsolete p2gen folder
| | * Update adt plugin's manifest to use lombok 0.2.3Siva Velusamy2015-01-141-1/+1
| | | | | | | | | | | | Change-Id: I87b5b3098758c33f8101760f6ccdbcd4ed016a2a
| | * Remove obsolete p2gen folderSiva Velusamy2015-01-142-210/+0
| |/ | | | | | | | | | | | | | | There was an experiment long ago to attempt to generate OSGI manifests on the fly, but it didn't pan out. This CL removes that stale folder. Change-Id: Id23d941c66e99f0458b169f8cf9b070c27eb2d7c
* | Merge "Update Eclipse POM" into studio-1.1-devTor Norbye2015-01-131-1/+1
|\ \ | |/ | | | | | | | | | | automerge: 5feacb9 * commit '5feacb9e8900acd654445a4552c4d120bd204837': Update Eclipse POM
| * Merge "Update Eclipse POM" into studio-1.1-devTor Norbye2015-01-131-1/+1
| |\
| | * Update Eclipse POMTor Norbye2015-01-131-1/+1
| |/ | | | | | | Change-Id: I57ddcca94347d8b13ecb2fd68127943005043234
* | Merge commit '3c8eb96ce2491b52cb181295e0481ec593777e0c' into studio-master-devThe Android Automerger2015-01-122-2/+2
|\ \ | |/
| * Merge "Use Lombok 0.2.3 for ADT plugin" into studio-1.1-devTor Norbye2015-01-072-2/+2
| |\
| | * Use Lombok 0.2.3 for ADT pluginTor Norbye2015-01-072-2/+2
| |/ | | | | | | Change-Id: I582a8900a2ca86a9cbfaccdb0dba2526b0bb2050
* | Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-216-16/+16
|\ \ | |/ | | | | | | | | | | automerge: 540d62b * commit '540d62bd9ac07112fe2925233826272039e895ed': Update ADT with ASM 5.0.3
| * Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-206-16/+16
| |\
| | * Update ADT with ASM 5.0.3Tor Norbye2014-12-196-16/+16
| |/ | | | | | | Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251
* | Merge "find_java.bat now uses env var instead of find" into studio-1.0-dev ↵David Herman2014-12-170-0/+0
|\ \ | |/ | | | | | | | | | | | | | | automerge: 93eddd6 automerge: 028925b * commit '028925bbfa330eee5d4b43e10b9f7f1c0fc6863f': find_java.bat now uses env var instead of find
| * Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | automerge: 93eddd6 * commit '93eddd6417c4be00b10ad63a0bc216c5a6839e50': find_java.bat now uses env var instead of find
| | * Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-151-3/+15
| | |\
| | | * find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The officially recommended way to query an OS for its 32-bit/64-bit architecture can be found in this KB article: http://support.microsoft.com/kb/556009 Unfortunately, this fails for some subset of users for at least two reasons: 1) Many users install Unix tools on their Windows box, overwriting "find" with the Unix variant that doesn't support the \i parameter 2) Some machines are simply missing reg.exe. I've seen one claim in the wild that this was due to an agressive anti-virus scanner removing malware from their machine. Therefore, we now use absolute paths to the utilities we want to target. Additionally, we now have fallback handling if reg.exe is missing, where we, instead, rely on the %PROCESSOR_ARCHITECTURE% environment variable. Related issues: https://code.google.com/p/android/issues/detail?id=82099 https://code.google.com/p/android/issues/detail?id=82388 Change-Id: Icee0882fa6e1f5359c086498eb2679197cdf6f8e (cherry picked from commit f8796b4dce9202306dcd49afbdc9272f26845329)
* | | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 4be655a * commit '4be655acbb80d7084e7d17f15512a37f7c75acd6': Minor improvements to systrace options dialog
| * | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
| |\ \
| | * | Minor improvements to systrace options dialogSiva Velusamy2014-12-161-24/+57
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL includes the following minor tweaks the systrace options dialog: - shows the default values to be used in a couple of text boxes - splits the list of tags into two sections: a commonly used set and a list of advanced tags Change-Id: I19b3033c099c181c2d801da262a899f6586da9fd
* | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev automerge: e99a450Tor Norbye2014-12-160-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 99a7828 * commit '99a78286d08b932d784b937fdf01ff6e99faec61': Update ADT & SDK Tools to 24.0.2