summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-29 22:05:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-29 22:05:11 +0000
commit2d3443fc5a6cf0830edd6a498a87760143dbc570 (patch)
treef5a5f96fdd0a3bd7f278714c7e5294367ed0a6ae /api
parent66c0adcfd4351518512df2f3e81526d2d67d6d65 (diff)
parent79c067c54a944660438c81ac2caf37ec68eedfa9 (diff)
downloadframeworks_base-2d3443fc5a6cf0830edd6a498a87760143dbc570.zip
frameworks_base-2d3443fc5a6cf0830edd6a498a87760143dbc570.tar.gz
frameworks_base-2d3443fc5a6cf0830edd6a498a87760143dbc570.tar.bz2
Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-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 a90fee9..fa02c4e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34729,12 +34729,14 @@ package android.view {
method public void setCallback(android.view.Window.Callback);
method public abstract void setChildDrawable(int, android.graphics.drawable.Drawable);
method public abstract void setChildInt(int, int);
+ method public void setClipToOutline(boolean);
method public void setContainer(android.view.Window);
method public abstract void setContentView(int);
method public abstract void setContentView(android.view.View);
method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
method protected void setDefaultWindowFormat(int);
method public void setDimAmount(float);
+ method public void setElevation(float);
method public void setEnterTransition(android.transition.Transition);
method public void setExitTransition(android.transition.Transition);
method public abstract void setFeatureDrawable(int, android.graphics.drawable.Drawable);