diff options
| author | Hasso Tepper <hasso.tepper@gmail.com> | 2013-07-09 17:37:29 +0300 |
|---|---|---|
| committer | Hasso Tepper <hasso.tepper@gmail.com> | 2013-07-09 17:37:29 +0300 |
| commit | 32fd416c0522d5fc30a4d74c0c0fbdeb934e2d78 (patch) | |
| tree | 414b9031533dc15e7e1cbff05cce4cd41d16ec9a | |
| parent | d50c81f90f30eaec86697389d3e5399a8841d4b7 (diff) | |
| download | android_packages_apps_CMFileManager-32fd416c0522d5fc30a4d74c0c0fbdeb934e2d78.tar.gz android_packages_apps_CMFileManager-32fd416c0522d5fc30a4d74c0c0fbdeb934e2d78.tar.bz2 android_packages_apps_CMFileManager-32fd416c0522d5fc30a4d74c0c0fbdeb934e2d78.zip | |
CMFileManager: Correct logic of string generation
Add the code for previously uncovered case - 1 folder and 1 file. While
there remove unnecessary '=' from some comparisons.
Change-Id: I9e4bd03eebcc52c055db6355483b921a832e963b
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a091aedc..b64216a2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -599,6 +599,8 @@ <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> folders selected.</string> <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> file selected.</string> <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> files selected.</string> + <string name="selection_one_folder_one_file"><xliff:g id="folders">%1$s</xliff:g> folder and + <xliff:g id="files">%2$s</xliff:g> file selected.</string> <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> folders and <xliff:g id="files">%2$s</xliff:g> file selected.</string> <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> folder and diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java index 9dfb6d7a..19cb33c7 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java @@ -134,16 +134,21 @@ public class SelectionView extends LinearLayout { if (folders == 0 && files == 1) { return getContext().getString(R.string.selection_one_file, Integer.valueOf(files)); } - if (folders == 0 && files >= 1) { + if (folders == 0 && files > 1) { return getContext().getString( R.string.selection_other_files, Integer.valueOf(files)); } + if (folders == 1 && files == 1) { + return getContext().getString( + R.string.selection_one_folder_one_file, + Integer.valueOf(folders), Integer.valueOf(files)); + } if (folders > 1 && files == 1) { return getContext().getString( R.string.selection_other_folders_one_file, Integer.valueOf(folders), Integer.valueOf(files)); } - if (folders == 1 && files >= 1) { + if (folders == 1 && files > 1) { return getContext().getString( R.string.selection_one_folder_other_files, Integer.valueOf(folders), Integer.valueOf(files)); |