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

Commit c1323664 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make the android.R.string.autofill public."

parents 366d27d3 555bcac6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,7 @@ package android { 
    field public static final int VideoView_error_text_invalid_progressive_playback = 17039381; // 0x1040015

    field public static final int VideoView_error_text_unknown = 17039377; // 0x1040011

    field public static final int VideoView_error_title = 17039378; // 0x1040012

    field public static final int autofill = 17039386; // 0x104001a

    field public static final int cancel = 17039360; // 0x1040000

    field public static final int copy = 17039361; // 0x1040001

    field public static final int copyUrl = 17039362; // 0x1040002

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2064,6 +2064,7 @@ package android { 
    field public static final int VideoView_error_text_invalid_progressive_playback = 17039381; // 0x1040015

    field public static final int VideoView_error_text_unknown = 17039377; // 0x1040011

    field public static final int VideoView_error_title = 17039378; // 0x1040012

    field public static final int autofill = 17039386; // 0x104001a

    field public static final int cancel = 17039360; // 0x1040000

    field public static final int copy = 17039361; // 0x1040001

    field public static final int copyUrl = 17039362; // 0x1040002

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,7 @@ package android { 
    field public static final int VideoView_error_text_invalid_progressive_playback = 17039381; // 0x1040015

    field public static final int VideoView_error_text_unknown = 17039377; // 0x1040011

    field public static final int VideoView_error_title = 17039378; // 0x1040012

    field public static final int autofill = 17039386; // 0x104001a

    field public static final int cancel = 17039360; // 0x1040000

    field public static final int copy = 17039361; // 0x1040001

    field public static final int copyUrl = 17039362; // 0x1040002

core/java/android/widget/Editor.java

+1 −1
Original line number Diff line number Diff line
@@ -2664,7 +2664,7 @@ public class Editor { 
                .setEnabled(mTextView.canSelectAllText())

                .setOnMenuItemClickListener(mOnContextMenuItemClickListener);

        menu.add(Menu.NONE, TextView.ID_AUTOFILL, MENU_ITEM_ORDER_AUTOFILL,

                com.android.internal.R.string.autofill)

                android.R.string.autofill)

                .setEnabled(mTextView.canRequestAutofill())

                .setOnMenuItemClickListener(mOnContextMenuItemClickListener);

core/res/res/values/public.xml

+18 −0
Original line number Diff line number Diff line
@@ -2825,6 +2825,23 @@ 


    <public type="string" name="paste_as_plain_text" id="0x01040019" />



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

       Resources added in version O MR1 of the platform



       NOTE: add <public> elements within a <public-group> like so:



       <public-group type="attr" first-id="0x01010531">

           <public name="exampleAttr1" />

           <public name="exampleAttr2" />

       </public-group>



       To add a new public-group block, choose an id value that is 1 greater

       than the last of that item above. For example, the last "attr" id

       value above is 0x01010530, so the public-group of attrs below has

       the id value of 0x01010531.

       =============================================================== -->

    <eat-comment />



    <public-group type="attr" first-id="0x01010569">

    </public-group>
@@ -2835,6 +2852,7 @@ 
    </public-group>



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

      <public name="autofill"/>

    </public-group>



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