summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-11-19 23:52:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-19 23:52:24 +0000
commitb130d5961cb154e8821cfa42fdd820d67497d84d (patch)
tree2d8946e0179d2e589e766eb263b53e95d84d59d0 /api
parent552eca1a713ab8f6c60d6ec0d350ef33813cd25b (diff)
parentcb8ed3705cd8f50d43ff4a0c5d91d545f28add7a (diff)
downloadframeworks_base-b130d5961cb154e8821cfa42fdd820d67497d84d.zip
frameworks_base-b130d5961cb154e8821cfa42fdd820d67497d84d.tar.gz
frameworks_base-b130d5961cb154e8821cfa42fdd820d67497d84d.tar.bz2
Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index b5055eb..c20ad64 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1056,6 +1056,7 @@ package android {
field public static final int scrollbars = 16842974; // 0x10100de
field public static final int scrollingCache = 16843006; // 0x10100fe
field public static final deprecated int searchButtonText = 16843269; // 0x1010205
+ field public static final int searchHintIcon = 16844038; // 0x1010506
field public static final int searchIcon = 16843907; // 0x1010483
field public static final int searchMode = 16843221; // 0x10101d5
field public static final int searchSettingsDescription = 16843402; // 0x101028a