diff options
| author | 2017-06-28 01:55:50 +0000 | |
|---|---|---|
| committer | 2017-06-28 01:55:57 +0000 | |
| commit | c1323664d46a502da8f8a4f5ca50f697a9eb1bd4 (patch) | |
| tree | 5800b9bc8a979b9b58871663b2fa08310c5f49d5 | |
| parent | 366d27d31e9341def03ba6eea310d6f56be69abd (diff) | |
| parent | 555bcac6b207a7d7d7440395d231f43c9bad1ca6 (diff) | |
Merge "Make the android.R.string.autofill public."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/widget/Editor.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 18 |
5 files changed, 22 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 40cb282cb1c1..0eab1fd802ca 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index 874088c3175c..833e1f6fc7c1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 44df93fc4ee3..e6c22ae979f0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index fa1bd910bdbb..1f2e3d02144a 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -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); diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 4868774723f4..48e667a06aa0 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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> <!-- =============================================================== |