Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark strings with incorrect contents as deprecated"

Browse Source 
am: 3a4addba4b

Change-Id: I76da2baee8fb1d3e26ba60d39b40f567ada04339
This commit is contained in:
Charles Munger
2019-11-18 13:56:20 -08:00
committed by android-build-merger
parent e9e1e8290a 3a4addba4b
commit 04af2e4f80
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -2023,7 +2023,7 @@ package android {
field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018 field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018
field public static final int httpErrorBadUrl = 17039367; // 0x1040007 field public static final int httpErrorBadUrl = 17039367; // 0x1040007
field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008 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 ok = 17039370; // 0x104000a
field public static final int paste = 17039371; // 0x104000b field public static final int paste = 17039371; // 0x104000b
field public static final int paste_as_plain_text = 17039385; // 0x1040019 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 status_bar_notification_info_overflow = 17039383; // 0x1040017
field public static final int unknownName = 17039374; // 0x104000e field public static final int unknownName = 17039374; // 0x104000e
field public static final int untitled = 17039375; // 0x104000f 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 { public static final class R.style {

4
core/res/res/values/strings.xml
View File

@@ -3056,9 +3056,9 @@
<string name="ok">OK</string> <string name="ok">OK</string>
<!-- Preference framework strings. --> <!-- Preference framework strings. -->
<string name="cancel">Cancel</string> <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> <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> <string name="no">Cancel</string>
<!-- This is the generic "attention" string to be used in attention dialogs. Typically <!-- This is the generic "attention" string to be used in attention dialogs. Typically
combined with setIconAttribute(android.R.attr.alertDialogIcon) combined with setIconAttribute(android.R.attr.alertDialogIcon)