From 82f67657f2582b87922c1275d1f75a47c58a09f1 Mon Sep 17 00:00:00 2001
From: Charles Munger <clm@google.com>
Date: Fri, 15 Nov 2019 14:13:18 -0800
Subject: Mark strings with incorrect contents as deprecated

Bug: 36908899
Test: No behavior changes
Change-Id: I963b75e81b1d09afa98f732a79bd3e695855451c
---
 api/current.txt                 | 4 ++--
 core/res/res/values/strings.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 1a87b2257d27..0964e7bac143 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2023,7 +2023,7 @@ package android {
     field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018
     field public static final int httpErrorBadUrl = 17039367; // 0x1040007
     field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008
-    field public static final int no = 17039369; // 0x1040009
+    field @Deprecated public static final int no = 17039369; // 0x1040009
     field public static final int ok = 17039370; // 0x104000a
     field public static final int paste = 17039371; // 0x104000b
     field public static final int paste_as_plain_text = 17039385; // 0x1040019
@@ -2033,7 +2033,7 @@ package android {
     field public static final int status_bar_notification_info_overflow = 17039383; // 0x1040017
     field public static final int unknownName = 17039374; // 0x104000e
     field public static final int untitled = 17039375; // 0x104000f
-    field public static final int yes = 17039379; // 0x1040013
+    field @Deprecated public static final int yes = 17039379; // 0x1040013
   }
 
   public static final class R.style {
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 6efa2d653b4c..e729b03c1b82 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3056,9 +3056,9 @@
     <string name="ok">OK</string>
     <!-- Preference framework strings. -->
     <string name="cancel">Cancel</string>
-    <!-- Preference framework strings. -->
+    <!-- Preference framework strings. {@deprecated Do not use. Incorrectly matches android.R.string.ok rather than "yes".} -->
     <string name="yes">OK</string>
-    <!-- Preference framework strings. -->
+    <!-- Preference framework strings. {@deprecated Do not use. Incorrectly matches android.R.string.cancel rather than "no".} -->
     <string name="no">Cancel</string>
     <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
          combined with setIconAttribute(android.R.attr.alertDialogIcon)
-- 
cgit v1.2.3-59-g8ed1b