From d73ff581f32631b6ed7e3c81d4fa2bbca2580865 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 27 May 2016 14:39:34 -0700 Subject: [PATCH] Fix two confusing naming issues android.R.string.yes is not "Yes" but "OK"; prefer android.R.string.ok for clarity android.R.string.no is not "No" but "Cancel"; prefer android.R.string.cancel for clarity Found by Error Prone. Bug: 27723540 Change-Id: Ia6f58a7e7543ad1cc4e4722de8d095d1de8df034 --- .../com/android/documentsui/dirlist/DirectoryFragment.java | 4 ++-- 1 file changed, 2 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 1a1fe61fce68d..a797f4565d642 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -882,7 +882,7 @@ public class DirectoryFragment extends Fragment new AlertDialog.Builder(getActivity()) .setView(message) .setPositiveButton( - android.R.string.yes, + android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // Finish selection mode first which clears selection so we @@ -903,7 +903,7 @@ public class DirectoryFragment extends Fragment getActivity(), docs, srcParent, getDisplayState().stack); } }) - .setNegativeButton(android.R.string.no, null) + .setNegativeButton(android.R.string.cancel, null) .show(); } }.execute(selected);