summaryrefslogtreecommitdiff
path: root/android
AgeCommit message (Collapse)Author
2015-08-04Merge ""Build Variants" view is only visible for Gradle-based Android ↵android-m-preview-2Alex Ruiz
projects." into studio-1.4-dev automerge: 6accd87 automerge: d339ffe * commit 'd339ffedf0ec2ed44f78ba732c3d0fa986eddbb5': "Build Variants" view is only visible for Gradle-based Android projects.
2015-08-04Merge ""Gradle Sync" action is only visible for Gradle projects." into ↵Alex Ruiz
studio-1.4-dev automerge: 5316b76 automerge: 9deb3a3 * commit '9deb3a38be7c9bdadbc70a2512951eb1cd412b3b': "Gradle Sync" action is only visible for Gradle projects.
2015-08-04Merge ""Build Variants" view is only visible for Gradle-based Android ↵Alex Ruiz
projects." into studio-1.4-dev
2015-08-04Merge ""Gradle Sync" action is only visible for Gradle projects." into ↵Alex Ruiz
studio-1.4-dev
2015-08-04Merge "Removed checks for null that introduced bug." into studio-1.4-dev ↵Alex Ruiz
automerge: a58b9f6 automerge: 82178ea * commit '82178ea8c8cb42028d6be8767cdad1a496f26690': Removed checks for null that introduced bug.
2015-08-04Merge "Removed checks for null that introduced bug." into studio-1.4-devAlex Ruiz
2015-08-04Merge "Hide file name in state list picker location panel" into ↵Jerome Gaillard
studio-1.4-dev automerge: 2cdeb5e automerge: b5b5ca8 * commit 'b5b5ca80bf107b0ece686911f642cb9da640d742': Hide file name in state list picker location panel
2015-08-04Merge "Hide file name in state list picker location panel" into studio-1.4-devJerome Gaillard
2015-08-04Merge "Pass in throwable when calling Log.error" into studio-1.4-dev ↵Siva Velusamy
automerge: 13a9226 automerge: e2e100d * commit 'e2e100dd243e039517134395f861bd028c948247': Pass in throwable when calling Log.error
2015-08-04Merge "Pass in throwable when calling Log.error" into studio-1.4-devSiva Velusamy
2015-08-04Merge "Only setting height to 1 when we are reducing the width" into ↵Diego Perez
studio-1.4-dev automerge: 3bc9319 automerge: f86bb57 * commit 'f86bb574fb4f6acf4e2b29469a3dba027af81601': Only setting height to 1 when we are reducing the width
2015-08-04Merge "Only setting height to 1 when we are reducing the width" into ↵Diego Perez
studio-1.4-dev
2015-08-04Only setting height to 1 when we are reducing the widthDiego Perez
This was part of the original patch but, since layoutlib was fixed, it wasn't necessary anymore. However, I ran into the issue today again when using an old layoutlib so I think it is safer to add it right now. When passing 1 to the height, in some cases, layoutlib will not correctly recalculate the size and will be stuck at a height 0, causing it to stop rendering. Change-Id: If482d688d1a29e2f948262049bcfd4cad9cb36fe
2015-08-04Merge "Avoid crash in new SDK preview" into studio-1.4-dev automerge: 94cb585Diego Perez
automerge: e1b87b9 * commit 'e1b87b9289aa9080c9a5b78b539768fd9bee9df2': Avoid crash in new SDK preview
2015-08-04Merge "Avoid crash in new SDK preview" into studio-1.4-devDiego Perez
2015-08-04"Build Variants" view is only visible for Gradle-based Android projects.Alex Ruiz
Bug: 22940161 Change-Id: I656e551ef93bb1d7d605cd9c71485c53c01ecfbc
2015-08-04"Gradle Sync" action is only visible for Gradle projects.Alex Ruiz
Bug: 22940656 Change-Id: I8b8b2d454b441e89f7975099ce1f4214d9b93681
2015-08-04Removed checks for null that introduced bug.Alex Ruiz
Bug: 22596984 Change-Id: I0f1d3c7d3a4cbc0bcb09c8b837be44fd203a667b
2015-08-04Merge "Regenerate sources/mockable jars on project rebuild." into ↵Michal Bendowski
studio-1.4-dev automerge: ffcf4b0 automerge: 09ca8a3 * commit '09ca8a3a10aacb34c6e9323ace5f247c48b6fbb6': Regenerate sources/mockable jars on project rebuild.
2015-08-04Merge "Regenerate sources/mockable jars on project rebuild." into studio-1.4-devMichal Bendowski
2015-08-04Merge "Implement Gradle aware add jetBrains annotation fix." into ↵Fuyao Zhao
studio-1.4-dev automerge: 0e32883 automerge: a754c33 * commit 'a754c33e68b5d8d14ef00284f16cb1960a145079': Implement Gradle aware add jetBrains annotation fix.
2015-08-03Implement Gradle aware add jetBrains annotation fix.Fuyao Zhao
Change-Id: Ib72f605a6b5c07f9717bfa3abe1fb636a423fdef
2015-08-03Pass in throwable when calling Log.errorSiva Velusamy
Log.error without a throwable simply creates a new throwable. But if we do that, all the stack traces point to a location in Logger.java. Instead, we create the Throwable where the error is logged. Change-Id: Iccb3940f10ad3c8b5603e868025efe6fd23a75a3
2015-08-04Merge "Implement Gradle awared \'Add JUnit dependency\' quick fix" into ↵Fuyao Zhao
studio-1.4-dev automerge: 2e6ab42 automerge: 8bd7cc6 * commit '8bd7cc60b5e3eb22ed31b19bc183f376ce5af0f5': Implement Gradle awared 'Add JUnit dependency' quick fix
2015-08-04Merge "Add module dep quickfix will correctly consider the type of module. ↵Fuyao Zhao
Don\'t generate source when doing gradle sync." into studio-1.4-dev automerge: f460715 automerge: 63815e7 * commit '63815e72ec63eb9ab4af986a917d03784423b625': Add module dep quickfix will correctly consider the type of module. Don't generate source when doing gradle sync.
2015-08-03Implement Gradle awared 'Add JUnit dependency' quick fixFuyao Zhao
Change-Id: I0205ac01b3f56dfeb7acc320d55137ed16d26dc7
2015-08-04Merge "Undo gradle awared quickfix would be able to automatically trigger ↵Fuyao Zhao
gradle sync" into studio-1.4-dev automerge: 438da09 automerge: 4ea4d02 * commit '4ea4d021da4c2613ff0e3463cfd92283dd31b408': Undo gradle awared quickfix would be able to automatically trigger gradle sync
2015-08-04Merge "Implement gradle aware \'Add library depedency\'." into ↵Fuyao Zhao
studio-1.4-dev automerge: bf7d61f automerge: 42dc035 * commit '42dc035d82d3d4fc7173995ee95617dddd02ea83': Implement gradle aware 'Add library depedency'.
2015-08-04Merge "Add module dep quickfix will correctly consider the type of module. ↵Fuyao Zhao
Don't generate source when doing gradle sync." into studio-1.4-dev
2015-08-03Add module dep quickfix will correctly consider the type of module.Fuyao Zhao
Don't generate source when doing gradle sync. Change-Id: I0076332bef7ce48cc1221b318a7445205847bd16
2015-08-04Merge "Undo gradle awared quickfix would be able to automatically trigger ↵Fuyao Zhao
gradle sync" into studio-1.4-dev
2015-08-04Merge "Implement gradle aware 'Add library depedency'." into studio-1.4-devFuyao Zhao
2015-08-03Merge "Fix UI of configuration toolbar" into studio-1.4-dev automerge: a829377Jerome Gaillard
automerge: 2b8c30c * commit '2b8c30cf648e279bb24e4583f53b9448ecd24468': Fix UI of configuration toolbar
2015-08-03Merge "Fix UI of configuration toolbar" into studio-1.4-devJerome Gaillard
2015-08-03Merge "Add checks for existence of entries in tree before scrolling." into ↵Chester Hsieh
studio-1.4-dev automerge: 0fc1ad3 automerge: f66ef3c * commit 'f66ef3cb2dae16e0feed7756489390bce2b5281e': Add checks for existence of entries in tree before scrolling.
2015-08-03Merge "Add checks for existence of entries in tree before scrolling." into ↵Chester Hsieh
studio-1.4-dev
2015-08-03Add checks for existence of entries in tree before scrolling.Chester Hsieh
Change-Id: I9abe5b5c616c5f11ed6f318eff2f44f7104c7f73
2015-08-03Merge "resolve merge conflicts of f77256e to studio-1.4-dev." into ↵Siva Velusamy
studio-1.4-dev automerge: 7aa8c13 automerge: 073b61f * commit '073b61ffdd1248614edc1c9aa5c784224f9939b8': analytics: Only report every 10th deployment
2015-08-03resolve merge conflicts of f77256e to studio-1.4-dev.Siva Velusamy
Change-Id: If93cdb0d87ee566862c6ea742c7038bfc2fe3a17
2015-08-03Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-dev ↵Andrew Shulaev
automerge: 9f218ff automerge: 7b5c3b4 * commit '7b5c3b472ea0843bb0c64393cb1cc445770e4542': Fix IndexNotReadyException in layout editor
2015-08-03Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-devAndrew Shulaev
2015-08-03Merge "Migrate some clients to getMainArtifact." into studio-1.4-dev ↵Alex Ruiz
automerge: cb4c135 automerge: b97d32c * commit 'b97d32c94fe35583c23a5b7f46018460802181e8': Migrate some clients to getMainArtifact.
2015-08-03Merge "Implement current source provider methods." into studio-1.4-dev ↵Alex Ruiz
automerge: ed3f379 automerge: 7dca8b9 * commit '7dca8b9f4b0a7f1362abc647cf6e0aebe10bddf3': Implement current source provider methods.
2015-08-03Merge "Migrate some clients to getMainArtifact." into studio-1.4-devAlex Ruiz
2015-08-03Merge "Implement current source provider methods." into studio-1.4-devAlex Ruiz
2015-08-03Fix UI of configuration toolbarJerome Gaillard
On Mac, the background of the configuration toolbar in the theme editor was not the same as the background of the preview. Change-Id: Iadf983eda0a515ee00b7db95c6aab10571af6128
2015-08-03Fix IndexNotReadyException in layout editorAndrew Shulaev
Way to reproduce an exception: 1. Open "Design" tab of a layout file 2. Run "Sync Project with Gradle Files" 3. Click on activity selector in top panel (a lot). 4. A click done straight after project sync is completed causes ActivityMenuAction#createPopupActionGroup to throw an exception. Going to dumb mode manually (by using internal action) doesn't give an ability to trigger the exception: popup just doesn't open. Steps described above trigger the exception reliably though. Change-Id: If2c92b3cd9d4686c50374a13937373b76ea654a5
2015-08-03analytics: Only report every 10th deploymentSiva Velusamy
Change-Id: I217166bbdf7ac73e95c4e42d4c601f713a893dcc
2015-08-03Merge "Change gradle\'s language setting when trigger language level change ↵Fuyao Zhao
quick fix" into studio-1.4-dev automerge: 79a69f4 automerge: 4b57c94 * commit '4b57c94bef0d9c327f94b7d3a740f8b632a17813': Change gradle's language setting when trigger language level change quick fix
2015-08-03Implement current source provider methods.Josh Giles
Implement the getActiveSourceProviders, getTestSourceProviders interface method for getting current providers, and refactor IdeaSourceProvider to use those methods. Remove a several now-unused methods on AndroidFacet. Change-Id: I73717324b9f510aff6a8be455e4dadfb2926a58c
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 12:06:27 +0000