diff options
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 56 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/util/PreferenceConstants.java | 4 |
2 files changed, 30 insertions, 30 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 5cc9773..dc77e6e 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -146,7 +146,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne @Nullable private ActionBar actionBar; private boolean inActionBarMenu = false; private boolean titleBarHide; - private boolean keyboardAlwaysVisible = false; + private boolean keyboardAlwaysVisible = false; private ServiceConnection connection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { @@ -437,10 +437,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne if (keyboardGroup.getVisibility() == View.GONE || inActionBarMenu) return; - if(keyboardAlwaysVisible == false) { - keyboardGroup.startAnimation(keyboard_fade_out); - keyboardGroup.setVisibility(View.GONE); - } + if(keyboardAlwaysVisible == false) { + keyboardGroup.startAnimation(keyboard_fade_out); + keyboardGroup.setVisibility(View.GONE); + } hideActionBarIfRequested(); keyboardGroupHider = null; } @@ -448,14 +448,14 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne handler.postDelayed(keyboardGroupHider, KEYBOARD_DISPLAY_TIME); } - private void hideEmulatedKeys() { - if(keyboardAlwaysVisible == false) { - if (keyboardGroupHider != null) - handler.removeCallbacks(keyboardGroupHider); - keyboardGroup.setVisibility(View.GONE); - } - hideActionBarIfRequested(); - } + private void hideEmulatedKeys() { + if(keyboardAlwaysVisible == false) { + if (keyboardGroupHider != null) + handler.removeCallbacks(keyboardGroupHider); + keyboardGroup.setVisibility(View.GONE); + } + hideActionBarIfRequested(); + } @TargetApi(11) private void requestActionBar() { @@ -578,21 +578,21 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne keyboardGroup = (LinearLayout) findViewById(R.id.keyboard_group); - keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); - if(keyboardAlwaysVisible) { - // equivalent to android:layout_above=keyboard_group - RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT); - layoutParams.addRule(RelativeLayout.ABOVE, R.id.keyboard_group); - pager.setLayoutParams(layoutParams); - - // Show virtual keyboard - keyboardGroup.setVisibility(View.VISIBLE); - - // We don't need the show keyboard button - findViewById(R.id.button_keyboard).setVisibility(View.GONE); - } + keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); + if(keyboardAlwaysVisible) { + // equivalent to android:layout_above=keyboard_group + RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + layoutParams.addRule(RelativeLayout.ABOVE, R.id.keyboard_group); + pager.setLayoutParams(layoutParams); + + // Show virtual keyboard + keyboardGroup.setVisibility(View.VISIBLE); + + // We don't need the show keyboard button + findViewById(R.id.button_keyboard).setVisibility(View.GONE); + } mKeyboardButton = (ImageView) findViewById(R.id.button_keyboard); mKeyboardButton.setOnClickListener(new OnClickListener() { diff --git a/app/src/main/java/org/connectbot/util/PreferenceConstants.java b/app/src/main/java/org/connectbot/util/PreferenceConstants.java index ae9ab04..3dd9aa5 100644 --- a/app/src/main/java/org/connectbot/util/PreferenceConstants.java +++ b/app/src/main/java/org/connectbot/util/PreferenceConstants.java @@ -48,8 +48,8 @@ public class PreferenceConstants { public static final String TITLEBARHIDE = "titlebarhide"; public static final String PG_UPDN_GESTURE = "pgupdngesture"; - public static final String KEYMODE = "keymode"; - public static final String KEY_ALWAYS_VISIVLE = "alwaysvisible"; + public static final String KEYMODE = "keymode"; + public static final String KEY_ALWAYS_VISIVLE = "alwaysvisible"; public static final String KEYMODE_RIGHT = "Use right-side keys"; public static final String KEYMODE_LEFT = "Use left-side keys"; |