diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java index 8bb8e1e1..c02ffd76 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java @@ -75,11 +75,6 @@ public class CommentMeasurementView extends MeasurementView { return comment; } - @Override - protected boolean showSoftInputForInputDialog() { - return true; - } - @Override protected View getInputView() { EditText input = new EditText(getContext()); @@ -91,7 +86,6 @@ public class CommentMeasurementView extends MeasurementView { input.setText(getValueAsString()); input.setSelectAllOnFocus(true); - input.requestFocus(); return input; } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java index d78664cf..1a32226a 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java @@ -91,11 +91,6 @@ public class DateMeasurementView extends MeasurementView { return dateFormat.format(date); } - @Override - protected boolean showSoftInputForInputDialog() { - return false; - } - @Override protected View getInputView() { DatePicker datePicker = new DatePicker(getContext()); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java index 2c62eb0b..81866ac0 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java @@ -404,11 +404,6 @@ public abstract class FloatMeasurementView extends MeasurementView { showEvaluatorRow(show); } - @Override - protected boolean showSoftInputForInputDialog() { - return true; - } - private float validateAndGetInput(View view) { EditText editText = view.findViewById(R.id.float_input); String text = editText.getText().toString(); @@ -441,7 +436,6 @@ public abstract class FloatMeasurementView extends MeasurementView { final EditText input = view.findViewById(R.id.float_input); input.setText(formatValue(value)); - input.requestFocus(); final TextView unit = view.findViewById(R.id.float_input_unit); unit.setText(getUnit()); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index 7e238323..eaf2b306 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -381,7 +381,6 @@ public abstract class MeasurementView extends TableLayout { return openScale.getSelectedScaleUser(); } - protected abstract boolean showSoftInputForInputDialog(); protected abstract View getInputView(); protected abstract boolean validateAndSetInput(View view); @@ -400,15 +399,6 @@ public abstract class MeasurementView extends TableLayout { dialog.setTitle(getName()); dialog.setIcon(getIcon()); - final InputMethodManager imm = (InputMethodManager) getContext() - .getSystemService(Context.INPUT_METHOD_SERVICE); - if (showSoftInputForInputDialog()) { - imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY); - } - else if (dialog.getCurrentFocus() != null) { - imm.hideSoftInputFromWindow(dialog.getCurrentFocus().getWindowToken(), 0); - } - final View input = getInputView(); FrameLayout fl = dialog.findViewById(android.R.id.custom); @@ -423,7 +413,6 @@ public abstract class MeasurementView extends TableLayout { && !validateAndSetInput(input)) { return; } - imm.hideSoftInputFromWindow(view.getWindowToken(), 0); dialog.dismiss(); } }; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java index 508b260a..bc59c518 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java @@ -93,11 +93,6 @@ public class TimeMeasurementView extends MeasurementView { return timeFormat.format(time); } - @Override - protected boolean showSoftInputForInputDialog() { - return false; - } - @Override protected View getInputView() { TimePicker timePicker = new TimePicker(getContext());