Merge "Make "Paste as plain text" resource string public." into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
7d4cf66b17
@@ -1951,6 +1951,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
|
||||
|
||||
@@ -2073,6 +2073,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
|
||||
|
||||
@@ -1951,6 +1951,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
|
||||
|
||||
@@ -2829,6 +2829,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
|
||||
|
||||
Reference in New Issue
Block a user