MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-53417 return "generate unsigned apk" option because it has different use case then "export unsigned apk"

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-03-13 15:33:07 +04:00
parent 7a17edcbcb
commit 3b51d97003
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
+5 -1
View File
@@ -137,7 +137,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
final String keystorePath = FileUtil.toSystemDependentName(VfsUtil.urlToPath(configuration.CUSTOM_DEBUG_KEYSTORE_PATH));
items.add(
createItem(module, facet, manifestFile, sourceRoots, externalJars, resPackagePath, classesDexPath, sdkPath, outputPath,
false, AndroidCompileUtil.isReleaseBuild(context), keystorePath));
configuration.GENERATE_UNSIGNED_APK, AndroidCompileUtil.isReleaseBuild(context), keystorePath));
}
}
}
@@ -271,6 +271,10 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
return true;
}
if (facet.getConfiguration().GENERATE_UNSIGNED_APK) {
return true;
}
return false;
}
plugins/android/src/org/jetbrains/android/compiler/AndroidResourcesPackagingCompiler.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class AndroidResourcesPackagingCompiler implements ClassPostProcessingCom
}
items.add(new MyItem(module, target, platformToolsRevision, manifestFile, resourcesDirPaths, assetDirPaths, outputPath,
false, AndroidCompileUtil.isReleaseBuild(context)));
configuration.GENERATE_UNSIGNED_APK, AndroidCompileUtil.isReleaseBuild(context)));
//items.add(new MyItem(module, target, manifestFile, resourcesDirPaths, assetsDirPath, outputPath + RELEASE_SUFFIX, true));
}
}
plugins/android/src/org/jetbrains/android/facet/AndroidFacetConfiguration.java
+2
View File
@@ -77,6 +77,8 @@ public class AndroidFacetConfiguration implements FacetConfiguration {
public boolean RUN_PROCESS_RESOURCES_MAVEN_TASK = true;
public boolean GENERATE_UNSIGNED_APK = false;
public String CUSTOM_DEBUG_KEYSTORE_PATH = "";
public boolean PACK_TEST_CODE = false;
plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form
+9 -1
View File
@@ -123,7 +123,7 @@
<properties/>
<border type="none"/>
<children>
<grid id="3e085" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="3e085" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -156,6 +156,14 @@
</constraints>
<properties/>
</component>
<component id="b01fc" class="javax.swing.JCheckBox" binding="myGenerateUnsignedApk">
<constraints>
<grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/AndroidBundle" key="android.facet.settings.generate.unsigned.apk"/>
</properties>
</component>
<component id="2efc8" class="javax.swing.JLabel" binding="myApkPathLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java
+7
View File
@@ -80,6 +80,7 @@ public class AndroidFacetEditorTab extends FacetEditorTab {
private JCheckBox myGenerateIdlWhenChanged;
private JCheckBox myIsLibraryProjectCheckbox;
private JPanel myAaptCompilerPanel;
private JCheckBox myGenerateUnsignedApk;
private ComboboxWithBrowseButton myApkPathCombo;
private JLabel myApkPathLabel;
private JRadioButton myRunProcessResourcesRadio;
@@ -310,6 +311,9 @@ public class AndroidFacetEditorTab extends FacetEditorTab {
if (myRunProcessResourcesRadio.isSelected() != myConfiguration.RUN_PROCESS_RESOURCES_MAVEN_TASK) {
return true;
}
if (myGenerateUnsignedApk.isSelected() != myConfiguration.GENERATE_UNSIGNED_APK) {
return true;
}
if (!myConfiguration.CUSTOM_DEBUG_KEYSTORE_PATH.equals(getSelectedCustomKeystorePath())) {
return true;
}
@@ -436,6 +440,8 @@ public class AndroidFacetEditorTab extends FacetEditorTab {
myConfiguration.LIBRARY_PROJECT = myIsLibraryProjectCheckbox.isSelected();
myConfiguration.RUN_PROCESS_RESOURCES_MAVEN_TASK = myRunProcessResourcesRadio.isSelected();
myConfiguration.GENERATE_UNSIGNED_APK = myGenerateUnsignedApk.isSelected();
myConfiguration.PACK_TEST_CODE = myIncludeTestCodeAndCheckBox.isSelected();
@@ -579,6 +585,7 @@ public class AndroidFacetEditorTab extends FacetEditorTab {
myCompileResourcesByIdeRadio.setVisible(mavenizedModule);
myCompileResourcesByIdeRadio.setSelected(!myConfiguration.RUN_PROCESS_RESOURCES_MAVEN_TASK);
myGenerateUnsignedApk.setSelected(myConfiguration.GENERATE_UNSIGNED_APK);
myIncludeTestCodeAndCheckBox.setSelected(myConfiguration.PACK_TEST_CODE);
updateAptPanel();