summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-24 16:55:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-24 16:55:41 +0000
commit73a36da6821639f0d76dfc5885613d0a544439fb (patch)
tree513e5fd0a8f6f9e45408fab3f16b2f91123f49d0
parentd60af92892fed1619916fdd94ce94612364a6793 (diff)
parent8d5a56d70cc8b94edd6b237df65a2a0bba164161 (diff)
Merge "Fix resource linking for EnableZenModeDialog" into main
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/notification/modes/EnableZenModeDialog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/notification/modes/EnableZenModeDialog.java b/packages/SettingsLib/src/com/android/settingslib/notification/modes/EnableZenModeDialog.java
index 054c84952fae..c48694cecb4c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/notification/modes/EnableZenModeDialog.java
+++ b/packages/SettingsLib/src/com/android/settingslib/notification/modes/EnableZenModeDialog.java
@@ -159,9 +159,9 @@ public class EnableZenModeDialog {
});
if (mCancelIsNeutral) {
- builder.setNeutralButton(R.string.cancel, null);
+ builder.setNeutralButton(android.R.string.cancel, null);
} else {
- builder.setNegativeButton(R.string.cancel, null);
+ builder.setNegativeButton(android.R.string.cancel, null);
}
View contentView = getContentView();