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

Commit 2e0d100f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 2656fa06: am 415cc610: am 8a265146: Merge "Selected count string needs plurals." into mnc-dev

* commit '2656fa065f820873695ba7743ad0a2ff7d913567':
  Selected count string needs plurals.
parents 20ce5eff e9eb9498
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@
    <!-- Button label that moves files to the current directory [CHAR LIMIT=24] -->
    <string name="button_move">Move</string>

    <!-- Action mode title summarizing the number of documents selected [CHAR LIMIT=32] -->
    <string name="mode_selected_count"><xliff:g id="count" example="3">%1$d</xliff:g> selected</string>

    <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
    <string name="sort_name">By name</string>
    <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+3 −4
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.os.Parcelable;
import android.os.SystemProperties;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.format.Formatter;
import android.text.format.Time;
@@ -500,8 +501,7 @@ public class DirectoryFragment extends Fragment {
        @Override
        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
            mode.getMenuInflater().inflate(R.menu.mode_directory, menu);
            mode.setTitle(getResources()
                    .getString(R.string.mode_selected_count, mCurrentView.getCheckedItemCount()));
            mode.setTitle(TextUtils.formatSelectedCount(mCurrentView.getCheckedItemCount()));
            return true;
        }

@@ -585,8 +585,7 @@ public class DirectoryFragment extends Fragment {
                }
            }

            mode.setTitle(getResources()
                    .getString(R.string.mode_selected_count, mCurrentView.getCheckedItemCount()));
            mode.setTitle(TextUtils.formatSelectedCount(mCurrentView.getCheckedItemCount()));
        }
    };