summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-07-10 23:50:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-10 20:54:59 +0000
commit8e77c47d7c534b22c7f6a819791300ca5e30b9cc (patch)
treee7dc409e044605d02d59ddfaee09241459d92259 /api
parente1f57d6f44909a66c7ab0af33dbc5289287e823a (diff)
parent14d1fa4ba753d3480abf031525da0aa23d8e5abe (diff)
downloadframeworks_base-8e77c47d7c534b22c7f6a819791300ca5e30b9cc.zip
frameworks_base-8e77c47d7c534b22c7f6a819791300ca5e30b9cc.tar.gz
frameworks_base-8e77c47d7c534b22c7f6a819791300ca5e30b9cc.tar.bz2
Merge "Elevation for action bars"
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 b0e8ef0..ed38885 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3159,6 +3159,7 @@ package android.app {
method public abstract deprecated void addTab(android.app.ActionBar.Tab, int, boolean);
method public abstract android.view.View getCustomView();
method public abstract int getDisplayOptions();
+ method public float getElevation();
method public abstract int getHeight();
method public int getHideOffset();
method public abstract deprecated int getNavigationItemCount();
@@ -3190,6 +3191,7 @@ package android.app {
method public abstract void setDisplayShowHomeEnabled(boolean);
method public abstract void setDisplayShowTitleEnabled(boolean);
method public abstract void setDisplayUseLogoEnabled(boolean);
+ method public void setElevation(float);
method public void setHideOffset(int);
method public void setHideOnContentScrollEnabled(boolean);
method public void setHomeActionContentDescription(java.lang.CharSequence);