summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2014-09-24 09:17:57 -0700
committerBill Yi <byi@google.com>2014-09-24 09:17:57 -0700
commit519c1f64330bcdb06962be38b943579002b66b15 (patch)
tree58c5221d414a9576ddf1de96f1223eb3659449e5
parent600ca140e2e31e76f9bef7d484387ea366812cb3 (diff)
downloadbase-519c1f64330bcdb06962be38b943579002b66b15.tar.gz
Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
Change-Id: I30305a3f821b4f75f5037ebf11b74cfb8f2c8bb2
-rw-r--r--api/current.txt3
-rw-r--r--core/res/res/values/public.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a98fcfb82613..0a80cac3b542 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -253,10 +253,13 @@ package android {
field public static final int actionModeCloseDrawable = 16843484; // 0x10102dc
field public static final int actionModeCopyDrawable = 16843538; // 0x1010312
field public static final int actionModeCutDrawable = 16843537; // 0x1010311
+ field public static final int actionModeFindDrawable = 16843898; // 0x101047a
field public static final int actionModePasteDrawable = 16843539; // 0x1010313
field public static final int actionModeSelectAllDrawable = 16843646; // 0x101037e
+ field public static final int actionModeShareDrawable = 16843897; // 0x1010479
field public static final int actionModeSplitBackground = 16843677; // 0x101039d
field public static final int actionModeStyle = 16843668; // 0x1010394
+ field public static final int actionModeWebSearchDrawable = 16843899; // 0x101047b
field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6
field public static final int actionProviderClass = 16843657; // 0x1010389
field public static final int actionViewClass = 16843516; // 0x10102fc
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 81879392c222..34f6afbfb6e3 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -568,6 +568,9 @@
<public type="attr" name="listChoiceIndicatorMultiple" id="0x0101021a" />
<public type="attr" name="versionCode" id="0x0101021b" />
<public type="attr" name="versionName" id="0x0101021c" />
+ <public type="attr" name="actionModeShareDrawable" id="0x01010479" />
+ <public type="attr" name="actionModeFindDrawable" id="0x0101047a" />
+ <public type="attr" name="actionModeWebSearchDrawable" id="0x0101047b" />
<public type="id" name="background" id="0x01020000" />
<public type="id" name="checkbox" id="0x01020001" />