From 56cd6f109b21a3e6bb1f808384fde3f775a5b65f Mon Sep 17 00:00:00 2001 From: Przemek Grondek <github@nerull7.info> Date: Mon, 21 Jul 2014 12:09:54 +0200 Subject: [PATCH] Fixed NumberPickerDialog --- .../java/info/nerull7/mysqlbrowser/NumberPickerDialog.java | 2 +- app/src/main/res/layout/number_picker_dialog.xml | 2 +- app/src/main/res/values/strings.xml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/NumberPickerDialog.java b/app/src/main/java/info/nerull7/mysqlbrowser/NumberPickerDialog.java index a4a1f33..c4778df 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/NumberPickerDialog.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/NumberPickerDialog.java @@ -66,7 +66,7 @@ public class NumberPickerDialog extends AlertDialog implements DialogInterface.O setTitle(title); setButton(DialogInterface.BUTTON_POSITIVE, context.getText(R.string.set), this); - setButton(DialogInterface.BUTTON_NEGATIVE, context.getText(R.string.no), + setButton(DialogInterface.BUTTON_NEGATIVE, context.getText(R.string.cancel), (OnClickListener) null); LayoutInflater inflater = diff --git a/app/src/main/res/layout/number_picker_dialog.xml b/app/src/main/res/layout/number_picker_dialog.xml index 9fa2420..3c72e79 100644 --- a/app/src/main/res/layout/number_picker_dialog.xml +++ b/app/src/main/res/layout/number_picker_dialog.xml @@ -32,7 +32,7 @@ This layout file is used by the AlertDialog when displaying a list of items. android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/pref_messages_to_save" + android:text="@string/pref_entries_per_page" android:padding="1dip" /> <NumberPicker diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index de5fd21..d51ab90 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,10 @@ <string name="title_activity_entries">EntriesActivity</string> <string name="general_category">General</string> <string name="entries_limit">Entries per page limit</string> - <string name="entries_summary">20 FIXME entries per page</string> + <string name="entries_summary">%s entries per page</string><!--<xliff:g id="count"></xliff:g>--> <string name="title_activity_setting">Settings</string> + <string name="cancel">Cancel</string> + <string name="set">Set</string> + <string name="pref_entries_per_page">Set number of entries per page</string> </resources>