Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-29 11:06:49 +02:00
commit 538e5a8799
2 changed files with 9 additions and 11 deletions

View file

@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:hint="@string/navigate_point_latitude"
android:imeOptions="actionNext"
android:inputType="textCapSentences"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</android.support.design.widget.TextInputLayout>
@ -139,7 +139,7 @@
android:layout_height="wrap_content"
android:hint="@string/navigate_point_longitude"
android:imeOptions="actionDone"
android:inputType="textCapSentences"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</android.support.design.widget.TextInputLayout>
@ -187,7 +187,7 @@
android:layout_height="wrap_content"
android:hint="@string/navigate_point_northing"
android:imeOptions="actionNext"
android:inputType="textCapSentences"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</android.support.design.widget.TextInputLayout>
@ -235,7 +235,7 @@
android:layout_height="wrap_content"
android:hint="@string/navigate_point_easting"
android:imeOptions="actionNext"
android:inputType="textCapSentences"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</android.support.design.widget.TextInputLayout>
@ -278,7 +278,7 @@
android:layout_height="wrap_content"
android:hint="@string/navigate_point_zone"
android:imeOptions="actionDone"
android:inputType="textCapSentences"
android:inputType="textCapCharacters|textNoSuggestions"
tools:text="22.12345"/>
</android.support.design.widget.TextInputLayout>

View file

@ -551,15 +551,13 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.coords_format)
.setSingleChoiceItems(entries, parent.currentFormat, null)
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
.setSingleChoiceItems(entries, parent.currentFormat, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int selectedPosition = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
parent.applyFormat(selectedPosition);
parent.applyFormat(which);
dialog.dismiss();
}
})
.setNegativeButton(R.string.shared_string_cancel, null);
});
return builder.create();
}
}