From 6e9e0fee4abaec3fae098685b8062ebab266470b Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 25 Mar 2021 18:16:21 +0530 Subject: [PATCH 1/3] Remove unnecessary onShowListener Change-Id: Ie14fa6db137c029f948d4a35d50d4b1d47561c03 --- .../documentsui/dirlist/RenameDocumentFragment.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java index 57ebc15ca..e93930fe4 100644 --- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java +++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java @@ -107,19 +107,13 @@ public class RenameDocumentFragment extends DialogFragment { }); mEditText.requestFocus(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialogInterface) { - dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent)); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent)); - } - }); - return dialog; } private void onShowDialog(DialogInterface dialog){ mDialog = dialog; + dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent)); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent)); Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE); button.setOnClickListener(this::onClickDialog); } -- GitLab From 79c803b4e8c3a901b7ee07f32abd5675bb20e986 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 25 Mar 2021 18:22:13 +0530 Subject: [PATCH 2/3] Use getActivity instead of context Change-Id: Ia2a98575250363b1302189d91fddcb5277967d5c --- .../android/documentsui/dirlist/RenameDocumentFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java index e93930fe4..fb344d94f 100644 --- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java +++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java @@ -112,8 +112,8 @@ public class RenameDocumentFragment extends DialogFragment { private void onShowDialog(DialogInterface dialog){ mDialog = dialog; - dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent)); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent)); + dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE); button.setOnClickListener(this::onClickDialog); } -- GitLab From 2e336d75d907de2b1fb488a5803cf708b81959f3 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 25 Mar 2021 18:53:59 +0530 Subject: [PATCH 3/3] Cast DialogInterface to AlertDialog Change-Id: Ief3a7fc2d7524e70f41feb75483060b0b27d9749 --- .../android/documentsui/dirlist/RenameDocumentFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java index fb344d94f..056e8356c 100644 --- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java +++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java @@ -112,8 +112,8 @@ public class RenameDocumentFragment extends DialogFragment { private void onShowDialog(DialogInterface dialog){ mDialog = dialog; - dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); + ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); + ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getActivity().getResources().getColor(R.color.accent)); Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE); button.setOnClickListener(this::onClickDialog); } -- GitLab