summaryrefslogtreecommitdiff
path: root/adt-branding
AgeCommit message (Collapse)Author
2015-04-22Merge "Update version to 1.2 RC 2" into studio-1.2-devTor Norbye
automerge: 9297970 * commit '9297970255585fee094639c9ef0c6f3cfce8fb72': Update version to 1.2 RC 2
2015-04-22Update version to 1.2 RC 2Tor Norbye
Change-Id: Ida217ce4d1d328238f287e8d00374c199b446bfd
2015-04-13Merge "Update version to 1.2 RC" into studio-1.2-devTor Norbye
automerge: 46881fa * commit '46881fa2f5d3c3ab5417a1e18f685fcd10e9a1e6': Update version to 1.2 RC
2015-04-13Update version to 1.2 RCTor Norbye
Change-Id: Iba029db748869ac277d84f487d640ef9f374e347
2015-04-10Merge "Updated version to 1.2 Beta 3" into studio-1.2-devTor Norbye
automerge: bcd692f * commit 'bcd692ffb674c92d7e4ecf4d411db7651bbc688b': Updated version to 1.2 Beta 3
2015-04-10Updated version to 1.2 Beta 3Tor Norbye
Change-Id: I81a89dcfcefaa96276a38b45cd978fcacc3aa7d0
2015-04-06Updated merged version to 141.498Tor Norbye
Change-Id: I7307037b42b184d5fe00cde1237bb935404584f3 Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml
2015-04-06Update version to 1.2 Beta 2Tor Norbye
Change-Id: I7e25c276a27012e4fba5adb0fe345779dad017d4
2015-04-01Updated base IDE to 14.1.1Tor Norbye
Change-Id: Ie79aacd5f8c419a88269e4a7ff57f7fa422b702e
2015-03-30Update version to 1.2 BetaTor Norbye
Change-Id: I51078ccb82e684335ded4a5079e192fe0bb4f84b
2015-03-24Updated to idea/141.177.4Tor Norbye
Change-Id: I4934974d492f666b1e9989f91274a09c04329ef5
2015-03-19Update version to 1.2 Preview 4Tor Norbye
Change-Id: If781a14eb827b2c416682eb75e473c50c8d8486c
2015-03-18Updated to idea/141.175.3Tor Norbye
Change-Id: I8df33d46770df866b93577a01bfd6c14caa6a9cd
2015-03-17Update version to 1.2.0 Preview 3Tor Norbye
Change-Id: Ice8e68ec029fb6404e524eeb13bd2cb2f00e86af
2015-03-11Updated IDE version to 141.104Tor Norbye
Change-Id: Ic55e438af51e46b458b8917b97f7233991739589
2015-03-09Update "Submit Feedback" URLSiva Velusamy
Change-Id: I883732ceaf2c4351142dc48b1c0ea92609f58b4a
2015-03-05Update version to 1.2.0 Preview 2Siva Velusamy
Change-Id: I5d929baeb227e5357e87242d6600cdea275ce184
2015-03-03Update statistics config URLs.Siva Velusamy
Rather than using Appengine to serve these URLS, we just use dl.google.com. Change-Id: I1607d6fef9b2302015ad3af2ca2f57257cd2c80f
2015-03-02Remove plugins configuration pageSiva Velusamy
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
2015-03-02Update product name in AppInfo.xmlSiva Velusamy
Change-Id: I16e373b9ad5b187d77d969596d6305e79a96eda9
2015-02-26Updated to idea/140.2683Tor Norbye
Change-Id: Id4554aeabd3e0771b88633859f2acee70a5c446f
2015-02-25Merge "150152: Update tool window icon" into studio-1.2-devTor Norbye
2015-02-24Uses the new standarized version string for stat purposes.Esteban de la Canal
Also adds a check to only run android studio if the version number is as expected. Change-Id: I1a8aea3fdd6e1001f2b75483abf484a5c7ae5022
2015-02-20150152: Update tool window iconTor Norbye
Change-Id: I75b0cd2e9efc9daf14add912371250dc5f721b85
2015-02-18Merge remote-tracking branch 'aosp/upstream-133' into merge-upstreamTor Norbye
Conflicts: android/src/com/android/tools/idea/gradle/project/GradleProjectImporter.java Change-Id: I45c82b8cd5ec0fee59a47a70652cec2e8b003de9
2015-02-11Merge remote-tracking branch 'aosp/upstream-133' into merge-upstreamTor Norbye
Conflicts: android/src/META-INF/plugin.xml android/src/com/android/tools/idea/gradle/messages/ProjectSyncMessages.java android/src/com/android/tools/idea/gradle/project/PostProjectSetupTasksExecutor.java Change-Id: I1d22c4b83105f2881dae4949287ded633ad64dd8
2015-02-05resolve merge conflicts of 6b2d25c to studio-1.2-dev.Tor Norbye
Change-Id: I4d877322ba0a53e620d0de12752d25036960f62d
2015-02-05Merge remote-tracking branch 'aosp/upstream-idea14' into merge-upstreamTor Norbye
Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml android/guiTestSrc/com/android/tools/idea/tests/gui/framework/fixture/ExecutionToolWindowFixture.java android/resources/messages/AndroidBundle.properties android/src/META-INF/plugin.xml android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java android/src/com/android/tools/idea/avdmanager/AvdWizardConstants.java android/src/com/android/tools/idea/configurations/LocaleMenuAction.java android/src/com/android/tools/idea/gradle/project/PostProjectSetupTasksExecutor.java android/src/com/android/tools/idea/gradle/variant/view/BuildVariantView.java android/src/com/android/tools/idea/lang/proguard/ProguardFileTypeFactory.java android/src/com/android/tools/idea/sdk/DefaultSdks.java android/src/com/android/tools/idea/templates/Template.java android/src/com/android/tools/idea/wizard/NewAndroidModulePath.java android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java android/testSrc/com/android/tools/idea/welcome/AndroidVirtualDeviceTest.java Change-Id: I9825f81c2fe13f44c3f4571c33c1a2eb29703f18
2015-02-02Link to Google Privacy Policy in Usage StatsSiva Velusamy
Change-Id: I330a591b901084754fd6631dadbc0075ad7ac132
2015-01-30Update version to 1.1 Beta 2Tor Norbye
Change-Id: I21b6e7e6c2373fc66651bda113117f9236c9324f
2015-01-26Update version to 1.1 beta and add build expiration checkTor Norbye
Change-Id: I17e6c1b43404afc2079441c745554e997fba43cb
2015-01-22Update version to 1.1 Preview 3Tor Norbye
Change-Id: I10e918b1272a7f5dd83857feb617b41dd4d2ac3d
2015-01-16Update version to 1.1a2Tor Norbye
Change-Id: Ic9b7c28002fb2ad5a7d93af418d11091c16c08c0
2015-01-14resolve merge conflicts of c94389c to studio-1.2-dev.Esteban de la Canal
Change-Id: I6084a63ce62f7942d7e96aa1eff04d51f98a698d
2015-01-14resolve merge conflicts of b201303 to studio-1.2-dev.Esteban de la Canal
Change-Id: I125105a66bdbd81bd68671ce9543504edf72fde7
2015-01-14Fixes low resolution icon in Linux.Esteban de la Canal
The image used for the icon in Linux when there is no .desktop shortcut set is not the same one used when the file is not present. The first one is any svg or png in the bin directory. The second one is the one specified in ApplicationInfo.xml Change-Id: I9cbc9fde0962ce3bd8803908be9b6f2eaf1b1417
2015-01-14Adds a strict version property.Esteban de la Canal
Adds a new property to hold a machine readable version number, which allows: . Better build ordering. . No spaces so fits better in links or directory names. . Can be properly grouped when sent via stats. The format follows Python strict version conventions for tool simplicity. See http://epydoc.sourceforge.net/stdlib/distutils.version.StrictVersion-class.html Change-Id: I5fe3c673b0ed55c280db2af115c57fcb35c31369
2015-01-12resolve merge conflicts of 7726c1e to studio-1.2-dev.Tor Norbye
Change-Id: Ieeebc571386b988200a08f58aeea5ce849fc3603
2015-01-12Update version to 1.1 Preview 1Tor Norbye
Change-Id: I2938fb302e1e04f74152a8615bfe0b94cc32a7db
2015-01-08Adds WinLauncher customizationsEsteban de la Canal
This CLs adds the files needed by the build script to customize WinLauncher[64].exe files. Change-Id: I85d680ab15f2279abf5d3e18d0c65b204edfcaa1
2014-12-29Merge branch 'studio-1.0-release' of ↵Eugene Kudelevsky
https://android.googlesource.com/platform/tools/adt/idea into android-tmp Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml android/resources/messages/AndroidBundle.properties android/src/META-INF/plugin.xml android/src/com/android/tools/idea/gradle/invoker/GradleTasksExecutor.java android/src/org/jetbrains/android/AndroidSdkResolveScopeProvider.java android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java
2014-12-29IDEA-134855 (base update checker URLs use HTTP scheme; -S layer regulated by ↵Roman Shevchenko
setting)
2014-12-19use httpsVladimir Krivosheev
2014-12-18Merge remote-tracking branch 'aosp/upstream-master' into merge-upstreamTor Norbye
Conflicts: adt-branding/src/idea/AndroidStudioApplicationInfo.xml android/android.iml android/guiTestSrc/com/android/tools/idea/tests/gui/framework/GuiTestCase.java android/guiTestSrc/com/android/tools/idea/tests/gui/framework/fixture/ExecutionToolWindowFixture.java android/guiTestSrc/com/android/tools/idea/tests/gui/gradle/GradleSyncTest.java android/lib/builder-model-0.14.0.jar android/lib/builder-model-1.0.0.jar android/lib/builder-model-1.1.0-rc1.jar android/lib/src/builder-model-1.0.0-sources.jar android/src/META-INF/plugin.xml android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java android/src/com/android/tools/idea/gradle/service/notification/errors/OutdatedAppEngineGradlePluginErrorHandler.java android/src/com/android/tools/idea/gradle/service/notification/hyperlink/CreateGradleWrapperHyperlink.java android/src/com/android/tools/idea/gradle/service/notification/hyperlink/StopGradleDaemonsHyperlink.java android/src/com/android/tools/idea/gradle/service/notification/hyperlink/UpgradeAppenginePluginVersionHyperlink.java android/src/com/android/tools/idea/gradle/util/GradleUtil.java android/src/com/android/tools/idea/sdk/DefaultSdks.java android/src/com/android/tools/idea/sdk/VersionCheck.java android/src/com/android/tools/idea/welcome/AndroidVirtualDevice.java android/src/com/android/tools/idea/welcome/FirstRunWizardMode.java android/src/com/android/tools/idea/welcome/InstallComponentsPath.java android/testData/guiTests/OutdatedAppEnginePlugin/backend/build.gradle android/testSrc/com/android/tools/idea/gradle/parser/GradleBuildFileTest.java android/testSrc/com/android/tools/idea/welcome/AndroidVirtualDeviceTest.java android/testSrc/com/android/tools/idea/welcome/FirstRunWizardTest.java native/WinLauncher/out/Release-Win32/studio.exe native/WinLauncher/out/Release-x64/studio64.exe native/WinLauncher/studio_splash.bmp Change-Id: Ia2021a49d2740cd69338b157f770c029ee686d5f
2014-12-18Update version to 1.0.2. DO NOT MERGETor Norbye
Change-Id: Idc5008b9014cff9ec3a65551feefc64e8ac7af1a (cherry picked from commit c25483790de8ac0ef6848fcc8dbad976fca8d99b)
2014-12-11Merge "Fix low-res splash screen" into studio-1.0-dev automerge: 82b779dTor Norbye
automerge: 25d69fd * commit '25d69fd361d0fd5399cd0504476c069b271175b9': Fix low-res splash screen
2014-12-11Merge "Fix low-res splash screen" into studio-1.0-devTor Norbye
automerge: 82b779d * commit '82b779d2dd23fdef70aa4bd5f82745627380a1a0': Fix low-res splash screen
2014-12-11Fix low-res splash screenTor Norbye
There was a typo in the low-res version of the splash screen (missing the word "the") Change-Id: I7505e9113276883ab4b1a8a93b3269b6d7b7cdf8 (cherry picked from commit 86418d3fe555f1ca06e5053de5d91e34963cc7fb)
2014-12-11Merge "Fix low-res splash screen" into studio-1.0-devTor Norbye
2014-12-11Update version to 1.0.1Tor Norbye
Change-Id: I9ae6aa7e072687dd3af2ac7d59ec881eea3705b9 (cherry picked from commit 6c064d1ffea4262e9b37c367517497eab3371423)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 16:45:42 +0000