Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use custom cancel string everywhere #6848

Merged
merged 1 commit into from
Aug 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ private void checkSelectedDownload(final StoredDirectoryHelper mainStorage,
final AlertDialog.Builder askDialog = new AlertDialog.Builder(context)
.setTitle(R.string.download_dialog_title)
.setMessage(msgBody)
.setNegativeButton(android.R.string.cancel, null);
.setNegativeButton(R.string.cancel, null);
final StoredFileHelper finalStorage = storage;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2080,7 +2080,7 @@ && playerIsNotStopped()
private void showClearingQueueConfirmation(final Runnable onAllow) {
new AlertDialog.Builder(activity)
.setTitle(R.string.clear_queue_confirmation_description)
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(android.R.string.yes, (dialog, which) -> {
onAllow.run();
dialog.dismiss();
Expand All @@ -2096,7 +2096,7 @@ private void showExternalPlaybackDialog() {
resolutions[i] = sortedVideoStreams.get(i).getResolution();
}
final AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.cancel, null)
.setNeutralButton(R.string.open_in_browser, (dialog, i) ->
ShareUtils.openUrlInBrowser(requireActivity(), url)
);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/dialog_feed_group_create.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/confirm_button"
android:text="@android:string/cancel" />
android:text="@string/cancel" />

<Button
android:id="@+id/confirm_button"
Expand Down