Skip to content

Commit 06e1ec6

Browse files
author
Fabrice Di Meglio
committed
Make Drawable RTL APIs public
- also optimize imports Change-Id: I2649a539a5784293d09179981a5d57e900219246
1 parent 3bef5e9 commit 06e1ec6

File tree

7 files changed

+8
-18
lines changed

7 files changed

+8
-18
lines changed

api/current.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9061,6 +9061,7 @@ package android.graphics.drawable {
90619061
method public int getMinimumWidth();
90629062
method public abstract int getOpacity();
90639063
method public boolean getPadding(android.graphics.Rect);
9064+
method public int getResolvedLayoutDirectionSelf();
90649065
method public int[] getState();
90659066
method public android.graphics.Region getTransparentRegion();
90669067
method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
@@ -9095,6 +9096,10 @@ package android.graphics.drawable {
90959096
method public abstract void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
90969097
}
90979098

9099+
public static abstract interface Drawable.Callback2 implements android.graphics.drawable.Drawable.Callback {
9100+
method public abstract int getResolvedLayoutDirection(android.graphics.drawable.Drawable);
9101+
}
9102+
90989103
public static abstract class Drawable.ConstantState {
90999104
ctor public Drawable.ConstantState();
91009105
method public abstract int getChangingConfigurations();
@@ -10782,8 +10787,8 @@ package android.media {
1078210787

1078310788
public class MediaActionSound {
1078410789
ctor public MediaActionSound();
10785-
method public void load(int);
10786-
method public void play(int);
10790+
method public synchronized void load(int);
10791+
method public synchronized void play(int);
1078710792
method public void release();
1078810793
field public static final int FOCUS_COMPLETE = 1; // 0x1
1078910794
field public static final int SHUTTER_CLICK = 0; // 0x0
@@ -23105,7 +23110,7 @@ package android.view {
2310523110
method public void recycle();
2310623111
}
2310723112

23108-
public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
23113+
public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.graphics.drawable.Drawable.Callback2 android.view.KeyEvent.Callback {
2310923114
ctor public View(android.content.Context);
2311023115
ctor public View(android.content.Context, android.util.AttributeSet);
2311123116
ctor public View(android.content.Context, android.util.AttributeSet, int);

core/java/android/widget/ImageView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ public void invalidateDrawable(Drawable dr) {
193193
}
194194
}
195195

196-
/**
197-
* @hide
198-
*/
199196
@Override
200197
public int getResolvedLayoutDirection(Drawable dr) {
201198
return (dr == mDrawable) ?

core/java/android/widget/ProgressBar.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,9 +910,6 @@ public void invalidateDrawable(Drawable dr) {
910910
}
911911
}
912912

913-
/**
914-
* @hide
915-
*/
916913
@Override
917914
public int getResolvedLayoutDirection(Drawable who) {
918915
return (who == mProgressDrawable || who == mIndeterminateDrawable) ?

core/java/android/widget/TextView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4376,9 +4376,6 @@ public void invalidateDrawable(Drawable drawable) {
43764376
}
43774377
}
43784378

4379-
/**
4380-
* @hide
4381-
*/
43824379
@Override
43834380
public int getResolvedLayoutDirection(Drawable who) {
43844381
if (who == null) return View.LAYOUT_DIRECTION_LTR;

graphics/java/android/graphics/drawable/ClipDrawable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.graphics.*;
2525
import android.view.Gravity;
2626
import android.util.AttributeSet;
27-
import android.view.View;
2827

2928
import java.io.IOException;
3029

graphics/java/android/graphics/drawable/Drawable.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ public static interface Callback {
296296

297297
/**
298298
* Implement this interface if you want to create an drawable that is RTL aware
299-
*
300-
* @hide
301299
*/
302300
public static interface Callback2 extends Callback {
303301
/**
@@ -387,8 +385,6 @@ public void unscheduleSelf(Runnable what) {
387385
/**
388386
* Use the current {@link android.graphics.drawable.Drawable.Callback2} implementation to get
389387
* the resolved layout direction of this Drawable.
390-
*
391-
* @hide
392388
*/
393389
public int getResolvedLayoutDirectionSelf() {
394390
final Callback callback = getCallback();

graphics/java/android/graphics/drawable/ScaleDrawable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.graphics.*;
2525
import android.view.Gravity;
2626
import android.util.AttributeSet;
27-
import android.view.View;
2827

2928
import java.io.IOException;
3029

0 commit comments

Comments
 (0)