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

Commit 6ecfd615 authored by Aga Wronska's avatar Aga Wronska Committed by android-build-merger
Browse files

Merge "Added word \'selected\' to action bar description of selected elements" into nyc-dev 

am: 83620211

* commit '83620211':
  Added word 'selected' to action bar description of selected elements
parents 162a7525 83620211

packages/DocumentsUI/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -213,4 +213,9 @@ 
        <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> file?</item>

        <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> files?</item>

    </plurals>

    <!-- Label text showing user how many items are selected. Can be one or more elements. -->

    <plurals name="elements_selected">

        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>

        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>

    </plurals>

</resources>

packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ public class DirectoryFragment extends Fragment 
            getActivity().getWindow().setStatusBarColor(color.data);



            if (mActionMode != null) {

                mActionMode.setTitle(String.valueOf(mSelected.size()));

                mActionMode.setTitle(Shared.getQuantityString(getActivity(),

                        R.plurals.elements_selected, mSelected.size()));

            }

        }