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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-28 01:55:50 +00:00
committed by Android (Google) Code Review
parent 366d27d31e 555bcac6b2
commit c1323664d4
5 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

1
api/system-current.txt
View File

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

1
api/test-current.txt
View File

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

2
core/java/android/widget/Editor.java
View File

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

18
core/res/res/values/public.xml
View File

@@ -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>
<!-- ===============================================================