Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-23 18:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove mParentView HACK now that we don't use the system soft keyboard

Browse Source
This commit is contained in:
Aaron Culliney 2015-07-24 22:36:57 -07:00
parent bca223780c
commit c2fdebd040
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
View File

@ -35,12 +35,10 @@ public class Apple2DisksMenu {
private final static String TAG = "Apple2DisksMenu"; private final static String TAG = "Apple2DisksMenu";
private Apple2Activity mActivity = null; private Apple2Activity mActivity = null;
private Apple2View mParentView = null;
private View mDisksView = null; private View mDisksView = null;
public Apple2DisksMenu(Apple2Activity activity, Apple2View parent) { public Apple2DisksMenu(Apple2Activity activity) {
mActivity = activity; mActivity = activity;
mParentView = parent;
setup(); setup();
} }
@ -144,11 +142,6 @@ public class Apple2DisksMenu {
public void dismissWithoutResume() { public void dismissWithoutResume() {
if (isShowing()) { if (isShowing()) {
((ViewGroup)mDisksView.getParent()).removeView(mDisksView); ((ViewGroup)mDisksView.getParent()).removeView(mDisksView);
// HACK FIXME TODO ... we seem to lose ability to toggle/show soft keyboard upon dismissal of mDisksView after use.
// This hack appears to get the Android UI unwedged ... =P
Apple2MainMenu androidUIFTW = mParentView.getMainMenu();
androidUIFTW.show();
androidUIFTW.dismiss();
} }
} }

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
View File

@ -184,14 +184,14 @@ public class Apple2MainMenu {
public synchronized Apple2DisksMenu getDisksMenu() { public synchronized Apple2DisksMenu getDisksMenu() {
if (mDisksMenu == null) { if (mDisksMenu == null) {
mDisksMenu = new Apple2DisksMenu(mActivity, mParentView); mDisksMenu = new Apple2DisksMenu(mActivity);
} }
return mDisksMenu; return mDisksMenu;
} }
public synchronized Apple2SettingsMenu getSettingsMenu() { public synchronized Apple2SettingsMenu getSettingsMenu() {
if (mSettingsMenu == null) { if (mSettingsMenu == null) {
mSettingsMenu = new Apple2SettingsMenu(mActivity, mParentView); mSettingsMenu = new Apple2SettingsMenu(mActivity);
} }
return mSettingsMenu; return mSettingsMenu;
} }

9
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
View File

@ -33,12 +33,10 @@ public class Apple2SettingsMenu {
private final static String TAG = "Apple2SettingsMenu"; private final static String TAG = "Apple2SettingsMenu";
private Apple2Activity mActivity = null; private Apple2Activity mActivity = null;
private Apple2View mParentView = null;
private View mSettingsView = null; private View mSettingsView = null;
public Apple2SettingsMenu(Apple2Activity activity, Apple2View parent) { public Apple2SettingsMenu(Apple2Activity activity) {
mActivity = activity; mActivity = activity;
mParentView = parent;
setup(); setup();
} }
@ -218,11 +216,6 @@ public class Apple2SettingsMenu {
public void dismissWithoutResume() { public void dismissWithoutResume() {
if (isShowing()) { if (isShowing()) {
((ViewGroup)mSettingsView.getParent()).removeView(mSettingsView); ((ViewGroup)mSettingsView.getParent()).removeView(mSettingsView);
// HACK FIXME TODO ... we seem to lose ability to toggle/show soft keyboard upon dismissal of mSettingsView after use.
// This hack appears to get the Android UI unwedged ... =P
Apple2MainMenu androidUIFTW = mParentView.getMainMenu();
androidUIFTW.show();
androidUIFTW.dismiss();
} }
} }