Resolve duration not being preselected when editing

CHANGELOG

@@ -1,6 +1,7 @@
 1.5.9:
 - Add resources menu linking to how to meditate, /r/meditation and replaying the tutorial
 - Resolve possible crash when waking device
+- Resolve duration not being preselected when editing
 - Remove usage of Google Play Services (was previously used in releases on Google Play and Amazon)
 
 1.5.8:

MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MainActivity.java

@@ -628,11 +628,11 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
 
             if (getMeditationAssistant().getTimerMode().equals("timed") || getMeditationAssistant().getTimerMode().equals("endat")) {
                 editDuration.requestFocus();
+
                 InputMethodManager imm = (InputMethodManager) this
                         .getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showSoftInput(editDuration,
                         InputMethodManager.SHOW_IMPLICIT);
-                editDuration.setSelection(0, editDuration.getText().length());
             }
         }
 
@@ -788,19 +788,17 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
 
         if (getMeditationAssistant().getEditingDuration()) {
             if (getMeditationAssistant().getTimerMode().equals("timed") || getMeditationAssistant().getTimerMode().equals("endat")) {
+                editDuration.setEnabled(true);
+                editDuration.requestFocus();
+
                 InputMethodManager imm = (InputMethodManager) this
                         .getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showSoftInput(editDuration,
                         InputMethodManager.SHOW_IMPLICIT);
-
-                editDuration.setSelection(0, editDuration.getText().length());
-                editDuration.setEnabled(true);
             } else {
-                editDuration.setSelection(0, 0);
                 editDuration.setEnabled(false);
             }
         } else {
-            editDuration.setSelection(0, 0);
             editDuration.setEnabled(false);
         }
 

MeditationAssistant/src/main/res/layout/activity_main.xml

@@ -61,6 +61,7 @@
                             android:layout_marginTop="0dp"
                             android:gravity="center"
                             android:imeOptions="actionDone"
+                            android:selectAllOnFocus="true"
                             android:includeFontPadding="false"
                             android:inputType="time"
                             android:lineSpacingMultiplier="0.9"