From: jihye kim Date: Fri, 9 Nov 2012 02:30:04 +0000 (+0900) Subject: [Title] emulator-manager : disable hw-virtualization and gl-acceleration in the arm... X-Git-Tag: 2.2.1_release^2~76^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f9ca37226cafc61101cd1e44527f15c1a35bdb7;p=sdk%2Femulator%2Femulator-manager.git [Title] emulator-manager : disable hw-virtualization and gl-acceleration in the arm emulator. [Desc.] disable hw-virtualization ant gl-acceleration in the arm emulaor. [Issue] N/A --- diff --git a/package/changelog b/package/changelog index 0bea81f..444b891 100644 --- a/package/changelog +++ b/package/changelog @@ -1,6 +1,11 @@ +*1.3.55 +- disable hw-virtualization and gl-acceleration in the arm emulator +- fix option in the arm emulator. +== 김지혜 2012-11-09 + *1.3.54 - change defalut skin to the phone shape skin -== 김지혜 2012-11-06 +== 김지혜 2012-11-08 *1.3.53 - add tool tip for file sharing to the mac os diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 54c55aa..5defa48 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-manager -Version: 1.3.54 +Version: 1.3.55 Maintainer: Yeong-Kyoon Lee Package: emulator-manager diff --git a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java index 9dad227..04325a3 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java +++ b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java @@ -337,11 +337,16 @@ class BaseImageButton extends TableWidget { newPath = path; newPathName = path.substring(path.lastIndexOf(File.separator) + 1, path.length()); - EmulatorVMs.getInstance().CustomArch = newPathName.endsWith("x86") ? "x86" : "arm"; + boolean isArm = newPathName.endsWith("arm"); + EmulatorVMs.getInstance().CustomArch = !isArm ? "x86" : "arm"; baseImageButton.setText(newPathName); isSelected = true; ((NameText)TableWidgetList.getInstance().findVMWidget("name", isCreateMode())).checkImageName(); + ((HWVirtualizationCombo)TableWidgetList.getInstance() + .findVMWidget("hw", isCreateMode())).settingWidgetState(isArm); + ((GLAccelerationCombo)TableWidgetList.getInstance() + .findVMWidget("gl", isCreateMode())).settingWidgetState(isArm); } } public void widgetDefaultSelected(SelectionEvent e) { @@ -539,8 +544,12 @@ class SkinCombo extends TableWidget { } if (!find) { - skinCombo.add(oldSkin.toString(), 0); - skinCombo.select(0); + if (oldSkin != null) { + skinCombo.add(oldSkin.toString(), 0); + skinCombo.select(0); + } + } else { + newSkin = tempSkin; } return true; @@ -834,12 +843,13 @@ class FileShareFolderButton extends TableWidget { } } -class HWVirtualizaiontCombo extends TableWidget { +class HWVirtualizationCombo extends TableWidget { private Combo HWVirtualCombo; private boolean oldIsSupport; private boolean newIsSupport; + private boolean isSelectedArm; - public HWVirtualizaiontCombo(boolean isCreate) { + public HWVirtualizationCombo(boolean isCreate) { super("hw", isCreate); setTitle("HW Virtualization"); } @@ -849,8 +859,12 @@ class HWVirtualizaiontCombo extends TableWidget { } public String getValue(VMPropertyValue value) { - return value.isHWVirtualization + if (value.archType.equals("arm")) { + return StringResource.NOT_SUPPORTED; + } else { + return value.isHWVirtualization ? StringResource.SUPPORTED : StringResource.NOT_SUPPORTED; + } } public void setValue(VMPropertyValue value) { @@ -858,16 +872,24 @@ class HWVirtualizaiontCombo extends TableWidget { } public boolean settingWidget(Table table, VMPropertyValue value) { - oldIsSupport = newIsSupport = value.isHWVirtualization; + isSelectedArm = false; + + boolean isArm = value.archType.equals("arm"); + + if (isCreateMode() && isArm) { + oldIsSupport = newIsSupport = false; + } else { + oldIsSupport = newIsSupport = value.isHWVirtualization; + } VMCreateHelper helper = new VMCreateHelper(); HWVirtualCombo = helper.makeCombo(table); helper.addComboItem(HWVirtualCombo, SupportType.getInstance().getList()); HWVirtualCombo.select(oldIsSupport - && CheckVirtualization.getInstance().isSupportVirtualization() + && CheckVirtualization.getInstance().isSupportVirtualization() && !isArm ? 0 : 1); - if (!CheckVirtualization.getInstance().isSupportVirtualization()) { + if (!CheckVirtualization.getInstance().isSupportVirtualization() || isArm) { HWVirtualCombo.setEnabled(false); } @@ -896,12 +918,32 @@ class HWVirtualizaiontCombo extends TableWidget { public void closeWidget() { HWVirtualCombo.dispose(); } + + public void settingWidgetState(boolean isArm) { + if (isArm) { + if (!isSelectedArm) { + oldIsSupport = newIsSupport; + newIsSupport = false; + } + isSelectedArm = true; + HWVirtualCombo.select(1); + HWVirtualCombo.setEnabled(false); + } else { + if (isSelectedArm) { + newIsSupport = oldIsSupport; + } + isSelectedArm = false; + HWVirtualCombo.select(newIsSupport ? 0 : 1); + HWVirtualCombo.setEnabled(true); + } + } } class GLAccelerationCombo extends TableWidget { private Combo GLAcceleCombo; private boolean oldIsSupport; private boolean newIsSupport; + private boolean isSelectedArm; public GLAccelerationCombo(boolean isCreate) { super("gl", isCreate); @@ -913,8 +955,12 @@ class GLAccelerationCombo extends TableWidget { } public String getValue(VMPropertyValue value) { - return value.isGLAcceleration + if (value.archType.equals("arm")) { + return StringResource.NOT_SUPPORTED; + } else { + return value.isGLAcceleration ? StringResource.SUPPORTED : StringResource.NOT_SUPPORTED; + } } public void setValue(VMPropertyValue value) { @@ -922,12 +968,24 @@ class GLAccelerationCombo extends TableWidget { } public boolean settingWidget(Table table, VMPropertyValue value) { - oldIsSupport = newIsSupport = value.isGLAcceleration; + isSelectedArm = false; + boolean isArm = value.archType.equals("arm"); + + if (isCreateMode() && isArm) { + oldIsSupport = newIsSupport = false; + } else { + oldIsSupport = newIsSupport = value.isGLAcceleration; + } VMCreateHelper helper = new VMCreateHelper(); GLAcceleCombo = helper.makeCombo(table); helper.addComboItem(GLAcceleCombo, SupportType.getInstance().getList()); - GLAcceleCombo.select(oldIsSupport ? 0 : 1); + GLAcceleCombo.select(oldIsSupport && !isArm ? 0 : 1); + + if (isArm) { + GLAcceleCombo.setEnabled(false); + } + return true; } @@ -951,6 +1009,25 @@ class GLAccelerationCombo extends TableWidget { public void closeWidget() { GLAcceleCombo.dispose(); } + + public void settingWidgetState(boolean isArm) { + if (isArm) { + if (!isSelectedArm) { + oldIsSupport = newIsSupport; + newIsSupport = false; + } + isSelectedArm = true; + GLAcceleCombo.select(1); + GLAcceleCombo.setEnabled(false); + } else { + if (isSelectedArm) { + newIsSupport = oldIsSupport; + } + isSelectedArm = false; + GLAcceleCombo.select(newIsSupport ? 0 : 1); + GLAcceleCombo.setEnabled(true); + } + } } class TouchPointLabel extends TableWidget { diff --git a/src/org/tizen/emulator/manager/ui/detail/TableWidgetList.java b/src/org/tizen/emulator/manager/ui/detail/TableWidgetList.java index 970c014..efea0c1 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TableWidgetList.java +++ b/src/org/tizen/emulator/manager/ui/detail/TableWidgetList.java @@ -41,7 +41,7 @@ public class TableWidgetList { createList.add(new RAMSizeCombo(true)); createList.add(new FileShareTypeCombo(true)); createList.add(new FileShareFolderButton(true)); - createList.add(new HWVirtualizaiontCombo(true)); + createList.add(new HWVirtualizationCombo(true)); createList.add(new GLAccelerationCombo(true)); createList.add(new TouchPointLabel(true)); } @@ -55,7 +55,7 @@ public class TableWidgetList { modifyList.add(new RAMSizeCombo(false)); modifyList.add(new FileShareTypeCombo(false)); modifyList.add(new FileShareFolderButton(false)); - modifyList.add(new HWVirtualizaiontCombo(false)); + modifyList.add(new HWVirtualizationCombo(false)); modifyList.add(new GLAccelerationCombo(false)); modifyList.add(new TouchPointLabel(false)); } diff --git a/src/org/tizen/emulator/manager/vms/Launcher.java b/src/org/tizen/emulator/manager/vms/Launcher.java index 33bc77f..9eba07b 100644 --- a/src/org/tizen/emulator/manager/vms/Launcher.java +++ b/src/org/tizen/emulator/manager/vms/Launcher.java @@ -300,7 +300,7 @@ public class Launcher { cmd.add("-device"); cmd.add("virtio-net,netdev=virtio-net,transport=virtio-mmio.1"); cmd.add("-append"); - cmd.add("yagl= 1 console=ttySAC2,115200 video=s3cfb:" + cmd.add("yagl=1 console=ttySAC2,115200 video=s3cfb:" + width + "x" + height