summaryrefslogtreecommitdiff
path: root/adt-branding
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-03-02 16:43:07 -0800
committerSiva Velusamy <vsiva@google.com>2015-03-02 16:43:07 -0800
commit796e2134a4dbf2871469044a67b5426da6c10175 (patch)
treed70fe6ee3feefc8328f590b1946582c2d641741d /adt-branding
parent4784273ad1b84cefd0abfc7d25d9e9b0b9748e6a (diff)
downloadidea-796e2134a4dbf2871469044a67b5426da6c10175.tar.gz
Remove plugins configuration page
In IJ 14, users see 2 pages initially before the welcome wizard. These allow enabling/disabling plugins. One of the pages allows enabling/disabling the Android plugin itself, so we removed it. However, it turns out that just having 1 plugin-page extension triggers an NPE in IDEA. So this commit disables that plugin config wizard page as well until we find an appropriate fix. Change-Id: Ic2f70ac91e79dd0a123741b750f843c04c06f9eb
Diffstat (limited to 'adt-branding')
-rwxr-xr-xadt-branding/src/idea/AndroidStudioApplicationInfo.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
index 23ef1687694..084eca667d5 100755
--- a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
+++ b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
@@ -42,7 +42,10 @@
<keymap win="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf"
mac="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf"/>
+ <!--
+ Temporarily disabled: There is a bug in IDEA which prevents having a single plugins page extension.
<plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
+ -->
<statistics settings="http://dl-sdk.appspot.com/diamond/stats/stat-assistant.xml"
service="http://dl-sdk.appspot.com/diamond/stats/index.jsp"