summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-07-14 16:39:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-14 16:39:04 -0700
commit0d60b96a8fecae55907bb07f49a267c23965617e (patch)
tree6edaa90214cacc8038be37f924f146bc2d994a88 /api
parent7ba6617a53424b85711313478459a0a8cda8c3da (diff)
parent29ed7575c2129974a57ad77b3531bc5995940c6c (diff)
downloadframeworks_base-0d60b96a8fecae55907bb07f49a267c23965617e.zip
frameworks_base-0d60b96a8fecae55907bb07f49a267c23965617e.tar.gz
frameworks_base-0d60b96a8fecae55907bb07f49a267c23965617e.tar.bz2
Merge "Bug 2841148 - Add accessors for action bar context mode state."
Diffstat (limited to 'api')
-rw-r--r--api/current.xml33
1 files changed, 33 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 9486ca6..2837747 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -19890,6 +19890,17 @@
visibility="public"
>
</method>
+<method name="getCustomView"
+ return="android.view.View"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getMenu"
return="android.view.Menu"
abstract="true"
@@ -19901,6 +19912,28 @@
visibility="public"
>
</method>
+<method name="getSubtitle"
+ return="java.lang.CharSequence"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTitle"
+ return="java.lang.CharSequence"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="invalidate"
return="void"
abstract="true"