From 04f22686faee54f1b90569c73a84e5d960ac6a4e Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Wed, 13 Apr 2016 21:22:26 -0700 Subject: [PATCH] Do not hide touchmenu for portrait calibration --- .../java/org/deadc0de/apple2ix/Apple2PortraitCalibration.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2PortraitCalibration.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2PortraitCalibration.java index 95a4ee33..482a4271 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2PortraitCalibration.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2PortraitCalibration.java @@ -104,7 +104,6 @@ public class Apple2PortraitCalibration implements Apple2MenuView { private Apple2Activity mActivity = null; private View mSettingsView = null; private ArrayList mViewStack = null; - private boolean mTouchMenuEnabled = false; private int mSavedTouchDevice = Apple2SettingsMenu.TouchDeviceVariant.NONE.ordinal(); private States mStateMachine = States.CALIBRATE_KEYBOARD_HEIGHT_SCALE; @@ -170,8 +169,6 @@ public class Apple2PortraitCalibration implements Apple2MenuView { } }); - mTouchMenuEnabled = (boolean) Apple2Preferences.getJSONPref(Apple2KeyboardSettingsMenu.SETTINGS.TOUCH_MENU_ENABLED); - Apple2Preferences.setJSONPref(Apple2KeyboardSettingsMenu.SETTINGS.TOUCH_MENU_ENABLED, false); mSavedTouchDevice = (int) Apple2Preferences.getJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT); Apple2Preferences.setJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT, Apple2SettingsMenu.TouchDeviceVariant.KEYBOARD.ordinal()); @@ -203,7 +200,6 @@ public class Apple2PortraitCalibration implements Apple2MenuView { Apple2Preferences.setJSONPref(Apple2Preferences.PREF_DOMAIN_TOUCHSCREEN, Apple2Preferences.PREF_CALIBRATING, false); - Apple2Preferences.setJSONPref(Apple2KeyboardSettingsMenu.SETTINGS.TOUCH_MENU_ENABLED, mTouchMenuEnabled); Apple2Preferences.setJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT, mSavedTouchDevice); Apple2Preferences.sync(mActivity, Apple2Preferences.PREF_DOMAIN_TOUCHSCREEN);