summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-05-30 23:21:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-30 23:21:33 +0000
commitae706066e1a9aa25c7d57619c0bf8ba24815d3d8 (patch)
treeb2c94f5776c1ccaef77f72ed4ba64ac0a9413f5d /api
parenta6716aade1d7bf0a60457d80da6aa85bc1006f57 (diff)
parentebba5d4edd763b19124b715a0f084d2f00c84a47 (diff)
downloadframeworks_base-ae706066e1a9aa25c7d57619c0bf8ba24815d3d8.zip
frameworks_base-ae706066e1a9aa25c7d57619c0bf8ba24815d3d8.tar.gz
frameworks_base-ae706066e1a9aa25c7d57619c0bf8ba24815d3d8.tar.bz2
Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index ab287fb..73decfb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -37642,8 +37642,10 @@ package android.widget {
method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener);
method public void setSubtitle(int);
method public void setSubtitle(java.lang.CharSequence);
+ method public void setSubtitleTextAppearance(android.content.Context, int);
method public void setTitle(int);
method public void setTitle(java.lang.CharSequence);
+ method public void setTitleTextAppearance(android.content.Context, int);
method public boolean showOverflowMenu();
}