Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a4addba authored by Charles Munger's avatar Charles Munger Committed by Gerrit Code Review
Browse files

Merge "Mark strings with incorrect contents as deprecated"

parents e3d6061a 82f67657

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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 {

























core/res/res/values/strings.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -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)