Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-19 20:24:34 +00:00
committed by Android (Google) Code Review
parent ddd7d3d766 78951ad998
commit 7b5327fb67
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -59,6 +59,7 @@ import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.OnItemTouchListener; import android.support.v7.widget.RecyclerView.OnItemTouchListener;
import android.support.v7.widget.RecyclerView.RecyclerListener; import android.support.v7.widget.RecyclerView.RecyclerListener;
import android.support.v7.widget.RecyclerView.ViewHolder; import android.support.v7.widget.RecyclerView.ViewHolder;
import android.text.BidiFormatter;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -787,11 +788,15 @@ public class DirectoryFragment extends Fragment
if (docs.size() == 1) { if (docs.size() == 1) {
// Deleteing 1 file xor 1 folder in cwd // 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 message = dirsCount == 0
? getActivity().getString(R.string.delete_filename_confirmation_message, ? getActivity().getString(R.string.delete_filename_confirmation_message,
docs.get(0).displayName) displayName)
: getActivity().getString(R.string.delete_foldername_confirmation_message, : getActivity().getString(R.string.delete_foldername_confirmation_message,
docs.get(0).displayName); displayName);
} else if (dirsCount == 0) { } else if (dirsCount == 0) {
// Deleting only files in cwd // Deleting only files in cwd
message = Shared.getQuantityString(getActivity(), message = Shared.getQuantityString(getActivity(),