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

Commit 8b9f1f67 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge "Make "Paste as plain text" resource string public." into oc-dev am: 7d4cf66b 

am: 9815cc57

Change-Id: Ie26187778f0d01be8926484accc9ecbda49946bd
parents e7b496f1 9815cc57

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1952,6 +1952,7 @@ package android { 
    field 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

    field public static final int search_go = 17039372; // 0x104000c

    field public static final int selectAll = 17039373; // 0x104000d

    field public static final int selectTextMode = 17039382; // 0x1040016

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2074,6 +2074,7 @@ package android { 
    field 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

    field public static final int search_go = 17039372; // 0x104000c

    field public static final int selectAll = 17039373; // 0x104000d

    field public static final int selectTextMode = 17039382; // 0x1040016

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1952,6 +1952,7 @@ package android { 
    field 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

    field public static final int search_go = 17039372; // 0x104000c

    field public static final int selectAll = 17039373; // 0x104000d

    field public static final int selectTextMode = 17039382; // 0x1040016

core/res/res/values/public.xml

+4 −0
Original line number Diff line number Diff line
@@ -2830,6 +2830,10 @@ 
        <public name="autofilled_highlight" />

    </public-group>



    <public-group type="string" first-id="0x01040019">

        <public name="paste_as_plain_text" />

    </public-group>





  <!-- ===============================================================

       DO NOT ADD UN-GROUPED ITEMS HERE