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

Commit 82471df3 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Fix RTL issue in delete dialog." into nyc-dev am: 7b5327fb67 

am: a1f7505fb6

* commit 'a1f7505fb6ed9bfe06aca658c2a869314a67b299':
  Fix RTL issue in delete dialog.

Change-Id: Ic0cb9b4367ea2bc3fd2134bb0be5305cb7f478fa
parents 51294a9f 95e40492

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

+7 −2
Original line number Diff line number Diff line
@@ -61,6 +61,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;
@@ -794,11 +795,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(),