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-96015 use 'match_parent' instead of 'fill_parent' when create new layouts if API 8+ is used

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-12-03 21:56:00 +04:00
parent bbff6c06b8
commit eb58badbb8
5 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/resources/fileTemplates/j2ee/layoutResourceFile.xml.ft
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<${ROOT_TAG} xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="${LAYOUT_WIDTH}"
android:layout_height="${LAYOUT_HEIGHT}">
</${ROOT_TAG}>
plugins/android/resources/fileTemplates/j2ee/layoutResourceFile_vertical.xml.ft
+2 -2
View File
@@ -2,7 +2,7 @@
<${ROOT_TAG} xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="${LAYOUT_WIDTH}"
android:layout_height="${LAYOUT_HEIGHT}">
</${ROOT_TAG}>
plugins/android/src/org/jetbrains/android/actions/CreateTypedResourceFileAction.java
+3
View File
@@ -26,6 +26,8 @@ import com.intellij.openapi.editor.CaretModel;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.InputValidatorEx;
import com.intellij.openapi.ui.Messages;
@@ -38,6 +40,7 @@ import com.intellij.psi.xml.XmlTag;
import com.intellij.util.PsiNavigateUtil;
import com.intellij.xml.refactoring.XmlTagInplaceRenamer;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.sdk.AndroidPlatform;
import org.jetbrains.android.util.AndroidBundle;
import org.jetbrains.android.util.AndroidResourceUtil;
import org.jetbrains.android.util.AndroidUtils;
plugins/android/src/org/jetbrains/android/sdk/AndroidPlatform.java
+5 -1
View File
@@ -182,6 +182,10 @@ public class AndroidPlatform {
public boolean needToAddAnnotationsJarToClasspath() {
// todo: check if we really don't need to add this
return myTarget.getVersion().getApiLevel() <= 15;
return getApiLevel() <= 15;
}
public int getApiLevel() {
return myTarget.getVersion().getApiLevel();
}
}
plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java
+15
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModulePackageIndex;
import com.intellij.openapi.roots.ModuleRootManager;
@@ -51,6 +52,7 @@ import org.jetbrains.android.dom.resources.Item;
import org.jetbrains.android.dom.resources.ResourceElement;
import org.jetbrains.android.dom.resources.Resources;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.sdk.AndroidPlatform;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -78,6 +80,8 @@ public class AndroidResourceUtil {
ResourceType.MENU, ResourceType.XML, ResourceType.COLOR,
ResourceType.DRAWABLE);
static final String ROOT_TAG_PROPERTY = "ROOT_TAG";
static final String LAYOUT_WIDTH_PROPERTY = "LAYOUT_WIDTH";
static final String LAYOUT_HEIGHT_PROPERTY = "LAYOUT_HEIGHT";
private AndroidResourceUtil() {
}
@@ -801,6 +805,17 @@ public class AndroidResourceUtil {
if (!valuesResourceFile) {
properties.setProperty(ROOT_TAG_PROPERTY, rootTagName);
}
if (ResourceType.LAYOUT.getName().equals(resourceType)) {
final Module module = ModuleUtilCore.findModuleForPsiElement(resSubdir);
final AndroidPlatform platform = module != null ? AndroidPlatform.getInstance(module) : null;
final int apiLevel = platform != null ? platform.getApiLevel() : -1;
final String value = apiLevel == -1 || apiLevel >= 8
? "match_parent" : "fill_parent";
properties.setProperty(LAYOUT_WIDTH_PROPERTY, value);
properties.setProperty(LAYOUT_HEIGHT_PROPERTY, value);
}
PsiElement createdElement = FileTemplateUtil.createFromTemplate(template, fileName, properties, resSubdir);
assert createdElement instanceof XmlFile;
return (XmlFile)createdElement;