Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32fd416c authored by Hasso Tepper's avatar Hasso Tepper
Browse files

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
parent d50c81f9

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java

+7 −2
Original line number Diff line number Diff line
@@ -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));