diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-30 12:22:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-30 12:22:50 -0700 |
| commit | 2effc77c9a49f983779dbab656bba490bb7d4ba0 (patch) | |
| tree | 970cdd601bb4a2bed3d716d08b92982f108fd518 /graphics | |
| parent | 0a5bc22273fc274a0d4bd9aa4bc80ee5116e11ef (diff) | |
| parent | fc4947491f785600b8770112fa1d19ece06d42f9 (diff) | |
| download | frameworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.zip frameworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.tar.gz frameworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.tar.bz2 | |
Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
Diffstat (limited to 'graphics')
3 files changed, 3 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/ClipDrawable.java b/graphics/java/android/graphics/drawable/ClipDrawable.java index 723db6e..b7429d4 100644 --- a/graphics/java/android/graphics/drawable/ClipDrawable.java +++ b/graphics/java/android/graphics/drawable/ClipDrawable.java @@ -239,6 +239,7 @@ public class ClipDrawable extends Drawable implements Drawable.Callback { return null; } + /** @hide */ @Override public void setLayoutDirection(int layoutDirection) { mClipState.mDrawable.setLayoutDirection(layoutDirection); diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 03531ac..0351b71 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -590,6 +590,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { return this; } + /** @hide */ @Override public void setLayoutDirection(int layoutDirection) { if (getLayoutDirection() != layoutDirection) { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index a5c3614..f8f3ac9 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -261,6 +261,7 @@ public class StateListDrawable extends DrawableContainer { return this; } + /** @hide */ @Override public void setLayoutDirection(int layoutDirection) { final int numStates = getStateCount(); |