From 78951ad99816cf7daf401c2923c7cc29145c277f Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Wed, 18 May 2016 16:25:41 -0700 Subject: [PATCH] Fix RTL issue in delete dialog. Bug:28772371 Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966 --- .../android/documentsui/dirlist/DirectoryFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 5e7a229fda9d4..870c3439b8a9f 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -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(),