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

Commit 47ad1542 authored by Charles Munger's avatar Charles Munger Committed by android-build-merger
Browse files

Merge "Mark strings with incorrect contents as deprecated" am: 3a4addba am: 04af2e4f 

am: 44c9f535

Change-Id: I76160b258170ae42fb340a4d30e1f35d6d8b8b45
parents 49ed2b6b 44c9f535

api/current.txt

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








@@ -3025,9 +3025,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)