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

Commit 6bea2122 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix RTL issue in delete dialog." into nyc-dev

parents 9469ba0d 927d8004

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

+7 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import android.support.v7.widget.RecyclerView; 
import android.support.v7.widget.RecyclerView.OnItemTouchListener;

import android.support.v7.widget.RecyclerView.RecyclerListener;

import android.support.v7.widget.RecyclerView.ViewHolder;

import android.text.BidiFormatter;

import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;
@@ -787,11 +788,15 @@ public class DirectoryFragment extends Fragment 


        if (docs.size() == 1) {

            // Deleteing 1 file xor 1 folder in cwd



            // Address b/28772371, where including user strings in message can result in

            // broken bidirectional support.

            String displayName = BidiFormatter.getInstance().unicodeWrap(docs.get(0).displayName);

            message = dirsCount == 0

                    ? getActivity().getString(R.string.delete_filename_confirmation_message,

                            docs.get(0).displayName)

                            displayName)

                    : getActivity().getString(R.string.delete_foldername_confirmation_message,

                            docs.get(0).displayName);

                            displayName);

        } else if (dirsCount == 0) {

            // Deleting only files in cwd

            message = Shared.getQuantityString(getActivity(),