summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-27am 4827508b: am 7d025240: (-s ours) am 9703be4c: am 6d957562: Merge "Fix ↵Diego Perez
simple mode sorting and UI tests" into studio-1.4-dev automerge: 74e54a7 automerge: e8239b0 * commit '4827508b010f934d839ef6f8904886bee53dc266':
2015-08-27am 957af89a: am 718a42c7: (-s ours) am 049ca9bc: am 8e380270: Merge "resolve ↵Tor Norbye
merge conflicts of 51ec685 to studio-1.4-dev." into studio-1.4-dev automerge: 5fc0f1d automerge: 1b1dd8a * commit '957af89ab221cabdda9a0874f7745bd280b7f7ac':
2015-08-27am 4d909fca: am 46984bef: (-s ours) am 380c8612: am 15c0ae4b: Merge "Update ↵Tor Norbye
builder-model to 1.3.0" into studio-1.3-dev automerge: 47eef8b automerge: e5c2d67 automerge: 54ce143 * commit '4d909fcae150a63d4ffa122d41d9abcc5ea578b0':
2015-08-27am d6c5882c: am 22fc4c72: (-s ours) am a3605d1d: am ebcc08ec: Merge "Fixing ↵Tor Norbye
error when haxm installer doesn\'t return revision" into studio-1.3-dev automerge: 007dfca automerge: 27ba2e0 automerge: e4cadeb * commit 'd6c5882c065b43e1dc4dd9109bb29bba59a127a1':
2015-08-27am b23d3e73: am 8ab4c0c8: (-s ours) am 52cf494d: am 15df44c6: Merge "Fix ↵Tor Norbye
NoClassDefFoundError during rendering." into studio-1.3-dev automerge: b749557 automerge: f830c6f automerge: a7feb81 * commit 'b23d3e732d40af496e417d6975ef52d9487ca503':
2015-08-27am da8e9892: am 07add85e: (-s ours) am 66942557: am d09275b6: Merge "Logcat ↵Esteban de la Canal
no longer discards last dead client" into studio-1.3-dev automerge: b3e3c82 automerge: 64d3e45 automerge: f3decb1 * commit 'da8e9892947125d71ec4e536e7c385e4baf920d7':
2015-08-27am a9f1274c: am ce5e9a5e: (-s ours) am af1f7c86: am 12908b01: Merge "resolve ↵Tor Norbye
merge conflicts of aca158a to studio-1.4-dev." into studio-1.4-dev automerge: c828d49 automerge: e48e380 * commit 'a9f1274c74900426652a69fc775e1c118bf6da9e':
2015-08-27am 6184965c: am 85dc9c83: (-s ours) am 0cf74f01: am 2dbbcff1: Merge "Fix ↵Andrew Shulaev
failing testGenerateToolTipText" into studio-1.4-dev automerge: 6cee7dd automerge: b152af2 * commit '6184965cdb492e42e7fce190f087ae063987fd50':
2015-08-27am e1f8097d: am 9d15e8b7: (-s ours) am 25bae2c3: am 6db97ec8: Merge "resolve ↵Michal Bendowski
merge conflicts of eaefb40 to studio-1.4-dev." into studio-1.4-dev automerge: d71f455 automerge: db6b680 * commit 'e1f8097d1300ee2b339566e9221da1ca88a4ea6a':
2015-08-27am 5d2854d1: am 486b868e: (-s ours) am 02397bb0: am 3e90745c: Merge ↵Tor Norbye
"b/22628881: Tweak toolbar wording" into studio-1.3-dev automerge: 25bc518 automerge: f9a3774 automerge: 017e1e7 * commit '5d2854d12dae879997f1393a205b744cae6dbf17':
2015-08-27am 2ce3a976: am 7d4b680e: (-s ours) am 14d29d16: am aa8ae4c2: Merge "Working ↵Esteban de la Canal
around issue in string encoding in hprof files." into studio-1.3-dev automerge: 3e4c7e1 automerge: 8fbbcdd automerge: 487a717 * commit '2ce3a9765ee4b70681bd0ef6c0c5bc4a320c45b5':
2015-08-27am 18f43342: am b596849b: (-s ours) am 2e1cf840: am 408227a7: Merge "resolve ↵Chester Hsieh
merge conflicts of 86bd093 to studio-1.4-dev." into studio-1.4-dev automerge: 554acd7 automerge: 0cc1b93 * commit '18f43342ab36eb6115f770f21fc60ffaefb237e2':
2015-08-27am 14830148: am 9ac45b8b: (-s ours) am 5281e150: am 4cbe9fa1: Merge ↵Joe Baker-Malone
"Semi-fixing GTK+ issue in sdk manager" into studio-1.4-dev automerge: a0d7421 automerge: 98b412c * commit '148301481698ca835f3a2674f42dda4ea4654910':
2015-08-27am 70359d4c: am 24494c03: (-s ours) am 58436f40: am 7c669715: Merge "Use ↵Alex Ruiz
getDefaultSourceProvider where possible." into studio-1.4-dev automerge: 4be5595 automerge: fb6cb23 * commit '70359d4c41621d2aeb547e18b0d75d98d1c103b4':
2015-08-27am bc7181b5: am a1aa7044: (-s ours) am 947e087f: am e193d168: Merge ↵Alex Ruiz
"Implement IdeaAndroidProject#getTargetSdkVersion." into studio-1.4-dev automerge: bfb179a automerge: 291e6d0 * commit 'bc7181b55ee24dd4cd878a0867a63fede3fb0d97':
2015-08-27am ee92040e: am 159e8aec: (-s ours) am 81b1bc3d: am 7db90703: Merge "Migrate ↵Alex Ruiz
min-SDK accessor to interface method." into studio-1.4-dev automerge: 22e1ba7 automerge: 857903b * commit 'ee92040e25cfc5c14b78a993a86eeb09f8fd1d25':
2015-08-27am 45ad5ef9: am d989ca95: (-s ours) am 20d4f66a: am 98bd7b41: Merge "Use SDK ↵Tor Norbye
version check rather than @TargetApi for API warnings" into studio-1.4-dev automerge: b9c994b automerge: 0ad91ee * commit '45ad5ef977f47c38334ad028906bc07a21732366':
2015-08-27am c4a50a24: am e3258f83: (-s ours) am b10f702e: am b86f2e9e: Merge ↵Alex Ruiz
"Implement IdeaAndroidProject#isDebuggable" into studio-1.4-dev automerge: 76a288a automerge: ae2f1f2 * commit 'c4a50a242e17f6d0e1a3317bf1c1da006b548687':
2015-08-27am a8bc544d: am 93678aff: (-s ours) am 6abeb6c0: am 39229b5e: Merge ↵Alex Ruiz
"Implement getAllApplicationIds, use it in chooser." into studio-1.4-dev automerge: 3c820fd automerge: 5917a04 * commit 'a8bc544d40e343a06b21464af81cdda82b4e8c7f':
2015-08-27am 1a340099: am 6e77cc9e: (-s ours) am 39c620c2: am 153d46c0: Merge "Move ↵Alex Ruiz
computePackageName calls to getApplicationId." into studio-1.4-dev automerge: ffcd440 automerge: 92e6e3a * commit '1a3400990472f1ecd5a2622e2edea6facd2dd611':
2015-08-27am d58d23b1: am dbc3741f: (-s ours) am 72f6bc52: am 69eaf06c: Merge "Catch ↵Chester Hsieh
an exception if user deletes file and editor hasn\'t synced yet." into studio-1.4-dev automerge: 82343e6 automerge: 0f904f9 * commit 'd58d23b117829b0f8b2248312a8cd1f682c966e9':
2015-08-27am 34799eed: am 45dbad67: (-s ours) am daae90db: am 473ea4d5: Merge ↵Alex Ruiz
"Trivially implement AndroidModel interface." into studio-1.4-dev automerge: 5796c79 automerge: 6b9a03d * commit '34799eedb2d22977854b37fc424d230034534929':
2015-08-27am c5942d54: am 52133abe: (-s ours) am 93c31d51: am 05ba9998: Merge "Reset ↵Yura
value only shown when value can actually be reset." into studio-1.4-dev automerge: cd9fb58 automerge: b34f870 * commit 'c5942d54792f9f289d3b82d885f9cf18235a99ed':
2015-08-27am 7e68b22a: am 3fc05a6a: (-s ours) am 63476e4c: am 69001aea: Merge "Draft a ↵Alex Ruiz
generic AndroidModel interface." into studio-1.4-dev automerge: 1e88256 automerge: 5723e1e * commit '7e68b22a3c4977de8c5ca1d08f79dcc04c01ded5':
2015-08-27am a4b559f7: am 4e48c66a: (-s ours) am bae10432: am 690756d9: Merge "Added ↵Alex Ruiz
extension point to handle build-system-independent project syncs after a SDK path change." into studio-1.4-dev automerge: 898096b automerge: 43e3998 * commit 'a4b559f73f9b583f472869ddcf10f36737706824':
2015-08-27am 8a5c362e: am 88fd8edc: (-s ours) am e26fdbb1: am a2135a1d: Merge "Remove ↵Diego Perez
warnings from ThemeEditorStyle" into studio-1.4-dev automerge: 0ce4462 automerge: 8046f97 * commit '8a5c362e8cf11934ded930bbd1c5452b8b4ea6b1':
2015-08-27am 79ec89ab: am 955095ea: (-s ours) am 99676c0c: am 6737d5bd: Merge "Use ↵Andrew Shulaev
proper ThemeResolver in tests of resolveAllAttributes" into studio-1.4-dev automerge: 520de3f automerge: cdd3c27 * commit '79ec89abc41ee2448afe55545a57ec357e3bb171':
2015-08-27am 69e6c7d2: am 7ce7fa02: (-s ours) am 961eee5d: am 84b122e8: Merge "Fix ↵Jens Ole Lauridsen
some Nele tests that are failing on Jenkins." into studio-1.4-dev automerge: bc7cbbe automerge: 6710c9e * commit '69e6c7d26ae02ed4636deda6ef2e983b0b6be50c':
2015-08-27am cea94622: am b914f5d4: (-s ours) am 4354a047: am 17dfd0eb: Merge "Android ↵Alex Ruiz
framework detection is not suppressed on projects that use an Android model." into studio-1.4-dev automerge: ea8f4ed automerge: 2bd4339 * commit 'cea94622048eb22134797f234b765c9a6546a3b8':
2015-08-27am a1e2fd3a: am 4c685659: (-s ours) am b1be1c4a: am fbdb354f: Merge "Use ↵Siva Velusamy
Disposer.dispose() instead of directly calling dispose()" into studio-1.4-dev automerge: 10523c7 automerge: 0dd4fca * commit 'a1e2fd3a4e2d82d3257641b3d7bb189d24c349e8':
2015-08-27am fd103ab0: am 5e57b566: (-s ours) am aeab6fd3: am 830589ef: Merge "Show ↵Siva Velusamy
lint errors on the design surface" into studio-1.4-dev automerge: 79ff64a automerge: 788cc55 * commit 'fd103ab0ed93184861d35db8b60eda63bf9f9d00':
2015-08-27am bab1e48d: am 2ccee7c6: (-s ours) am d1c48921: am e658dc09: Merge "Extend ↵Oleksiy Vyalov
run configuration with activity extra flags field." into studio-1.4-dev automerge: c479bf6 automerge: 7abcb97 * commit 'bab1e48da976c49dc7cced4dbb4b5a4379baf983':
2015-08-27am 7d02918e: am 157d0d7e: (-s ours) am fe313365: am 1bba98fd: Merge "Relax ↵Andrew Shulaev
requirement of getAllParents, add couple of javadoc comments" into studio-1.4-dev automerge: 7fb48bd automerge: 9299ca7 * commit '7d02918e1ceb973dc537784b3a1fd1ba3ca990b8':
2015-08-27am 0acd38aa: am 86bef3c7: (-s ours) am 0cfa4173: am 4cdb7d47: Merge "Nele: ↵Jens Ole Lauridsen
Add dependency checks for palette." into studio-1.4-dev automerge: 0eb409c automerge: ad2b731 * commit '0acd38aa70fca3bdbaf313cc1158ac8f3505c452':
2015-08-27am 7a62ff93: am 4d0acb91: (-s ours) am eda1d366: am f7cde2b4: Merge "Fix ↵Renaud Paquay
test to pass on Windows." into studio-1.4-dev automerge: e54967a automerge: efaea37 * commit '7a62ff931fc1e3e39d4193485d51aeb3ab3123b8':
2015-08-27am 46ef0f35: am 538cd45a: (-s ours) am a5b69aef: am fa635b95: Merge changes ↵Joe Baker-Malone
I8d00025d,I5fee2bc5 into studio-1.4-dev automerge: f0c45a1 automerge: e43e7b0 * commit '46ef0f35bb7214bb12fbf26e1e963fc5bc8fe34d':
2015-08-27am 46732275: am 28559ac1: (-s ours) am 96e4fd6e: am 3c83c957: Merge "Fix ↵Andrew Shulaev
parents resolution for themes which parent reside in another module" into studio-1.4-dev automerge: 17f2be7 automerge: 7f8f76e * commit '46732275bd812b06e4edce1f06d6a2e87954fa3d':
2015-08-27am 64aeda02: am 263e36a4: (-s ours) am c3d5bd20: am 905e312f: Merge "Better ↵Andrew Shulaev
default names in Theme Editor\'s color picker" into studio-1.4-dev automerge: 49edc55 automerge: 39cc4a0 * commit '64aeda023654cebd018ceef9cfe300c3636047e3':
2015-08-27am 586296b9: am b81293ef: (-s ours) am 068fd516: am d8048d5d: Merge "Extract ↵Fuyao Zhao
a gradleSyncAndImportClass method into GradleDependencyFix class so that other quickfixes could reuse it." into studio-1.4-dev automerge: d19e1b8 automerge: a2c1a81 * commit '586296b98d08e56a0bb57c70c0a0a9c060976015':
2015-08-27am 0ce82ecb: am 87d5a617: (-s ours) am e75215b1: am 033d6e84: Merge "Fixing ↵Joe Baker-Malone
links in first run wizard" into studio-1.4-dev automerge: c1bb602 automerge: 861141a * commit '0ce82ecb82f0ba0aa1eccb61267d30dec08237b4':
2015-08-27am 7caa91b8: am 570bc999: (-s ours) am 972720bd: am 2ff8b3ee: Merge "When ↵Diego Perez
the width is increasing, reset height" into studio-1.4-dev automerge: 016ea7c automerge: afdbb91 * commit '7caa91b8323a3c2bab4964059ed3507dacb2c901':
2015-08-27am e5fd6968: am 26dcb2b4: (-s ours) am 45f410b8: am edc1d9ae: Merge "Fix ↵Diego Perez
Color and Drawable cell colors" into studio-1.4-dev automerge: e2ac326 automerge: 02ba7fd * commit 'e5fd69688ff51f132bb954aca1f9651c53825608':
2015-08-27am a9d6ea07: am 2dacd4ac: (-s ours) am b2f1c8f8: am fa0ed743: Merge "Darker ↵Andrew Shulaev
background in theme editor preview on Darcula" into studio-1.4-dev automerge: f7c693c automerge: 8ec1123 * commit 'a9d6ea0720492395353d4270e8e5c9e8da653f6d':
2015-08-27am c4d30a12: am 66711a5b: (-s ours) am 7bbb6f75: am e8e88e86: Merge "Add a ↵Andrew Shulaev
Theme Editor test for multiple module support" into studio-1.4-dev automerge: 84216a9 automerge: b237250 * commit 'c4d30a123d7db44dec66a854747aa0a275289106':
2015-08-27am 310ec94a: am 6287e7d1: (-s ours) am 70fa3b78: am a5a8ad71: Merge "Missing ↵Jens Ole Lauridsen
changes for dependency layer." into studio-1.4-dev automerge: 8f767d6 automerge: be86fb6 * commit '310ec94ab48df0e88bb10ea34b620579058c77c3':
2015-08-27am 3adccbbf: am ee0afc39: (-s ours) am 8e2ac6f7: am 2cd12d65: Merge "Remove ↵Andrew Shulaev
duplicated getTestInstrumentationRunnerArguments method" into studio-1.4-dev automerge: d041015 automerge: 285b2eb * commit '3adccbbf8d7611be44bd5746930676b4f5a64b3f':
2015-08-27am 91b1fe10: am ce6a682a: (-s ours) am f44eb582: am bc1454b2: Merge "Fix ↵Diego Perez
theme attribute resolution" into studio-1.4-dev automerge: b05a020 automerge: 3857a07 * commit '91b1fe10fda3240b13d7dae04fd0c53509689c53':
2015-08-27am 1214f196: am fcc074db: (-s ours) am 43021d1e: am d02af891: Merge "Fix ↵Diego Perez
toolbar definition to use the correct colors" into studio-1.4-dev automerge: b156678 automerge: c33cebe * commit '1214f196b6440bd9ab06ac1ce69a324648cb8d14':
2015-08-27am 1a2ba70b: am fdcc7774: (-s ours) am b6323440: am d6f38fde: Merge "Stubbed ↵Juan Nuno
getTestInstrumentationRunnerArguments" into studio-1.4-dev automerge: 2af47f0 automerge: b7a4651 * commit '1a2ba70b1c8136495a532213a52a0c6af218cdc6':
2015-08-27am bc70ccef: am bc4a5ab4: (-s ours) am 071dda77: am 69f7b643: Merge "Add a ↵Jens Ole Lauridsen
build system independent layer for checking dependencies." into studio-1.4-dev automerge: 6ad5299 automerge: d828634 * commit 'bc70ccef8b11af9d657f98fd50eef2e2d5481958':
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 04:48:54 +0000