Skip to content

Commit 2effc77

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
2 parents 0a5bc22 + fc49474 commit 2effc77

File tree

7 files changed

+1077
-159
lines changed

7 files changed

+1077
-159
lines changed

api/17.txt

Lines changed: 1036 additions & 129 deletions
Large diffs are not rendered by default.

api/current.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9354,7 +9354,6 @@ package android.graphics.drawable {
93549354
method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
93559355
method public void setAlpha(int);
93569356
method public void setColorFilter(android.graphics.ColorFilter);
9357-
method public void setLayoutDirection(int);
93589357
method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
93599358
field public static final int HORIZONTAL = 1; // 0x1
93609359
field public static final int VERTICAL = 2; // 0x2
@@ -9546,7 +9545,6 @@ package android.graphics.drawable {
95469545
method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);
95479546
method public void setId(int, int);
95489547
method public void setLayerInset(int, int, int, int, int);
9549-
method public void setLayoutDirection(int);
95509548
method public void setOpacity(int);
95519549
method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
95529550
}
@@ -9640,7 +9638,6 @@ package android.graphics.drawable {
96409638
public class StateListDrawable extends android.graphics.drawable.DrawableContainer {
96419639
ctor public StateListDrawable();
96429640
method public void addState(int[], android.graphics.drawable.Drawable);
9643-
method public void setLayoutDirection(int);
96449641
}
96459642

96469643
public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {

core/java/android/os/Build.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public static class VERSION_CODES {
413413
public static final int JELLY_BEAN = 16;
414414

415415
/**
416-
* Moar jelly beans!
416+
* Android 4.2: Moar jelly beans!
417417
*
418418
* <p>Applications targeting this or a later release will get these
419419
* new changes in behavior:</p>
@@ -422,6 +422,12 @@ public static class VERSION_CODES {
422422
* {@code false}. See
423423
* <a href="{@docRoot}guide/topics/manifest/provider-element.html#exported">
424424
* the android:exported section</a> in the provider documentation for more details.</li>
425+
* <li>{@link android.view.View#getLayoutDirection() View.getLayoutDirection()}
426+
* can return different values than {@link android.view.View#LAYOUT_DIRECTION_LTR}
427+
* based on the locale etc.
428+
* <li> {@link android.webkit.WebView#addJavascriptInterface(Object, String)
429+
* WebView.addJavascriptInterface} requires explicit annotations on methods
430+
* for them to be accessible from Javascript.
425431
* </ul>
426432
*/
427433
public static final int JELLY_BEAN_MR1 = 17;

core/res/res/values/public.xml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,9 +1981,9 @@
19811981
<public type="attr" name="importantForAccessibility" id="0x010103aa" />
19821982
<public type="attr" name="keyboardLayout" id="0x010103ab" />
19831983
<public type="attr" name="fontFamily" id="0x010103ac" />
1984-
19851984
<public type="attr" name="mediaRouteButtonStyle" id="0x010103ad" />
19861985
<public type="attr" name="mediaRouteTypes" id="0x010103ae" />
1986+
19871987
<public type="style" name="Widget.Holo.MediaRouteButton" id="0x010301d5" />
19881988
<public type="style" name="Widget.Holo.Light.MediaRouteButton" id="0x010301d6" />
19891989
<public type="style" name="Widget.DeviceDefault.MediaRouteButton" id="0x010301d7" />
@@ -1993,30 +1993,35 @@
19931993
Resources added in version 17 of the platform (Jelly Bean MR1)
19941994
=============================================================== -->
19951995
<eat-comment />
1996-
<public type="attr" name="supportsRtl" />
1997-
<public type="attr" name="textDirection" />
1998-
<public type="attr" name="textAlignment" />
1999-
<public type="attr" name="layoutDirection" />
2000-
<public type="attr" name="paddingStart"/>
2001-
<public type="attr" name="paddingEnd"/>
2002-
<public type="attr" name="layout_marginStart"/>
2003-
<public type="attr" name="layout_marginEnd"/>
2004-
<public type="attr" name="layout_toStartOf" />
2005-
<public type="attr" name="layout_toEndOf" />
2006-
<public type="attr" name="layout_alignStart" />
2007-
<public type="attr" name="layout_alignEnd" />
2008-
<public type="attr" name="layout_alignParentStart" />
2009-
<public type="attr" name="layout_alignParentEnd" />
2010-
<public type="attr" name="listPreferredItemPaddingStart" />
2011-
<public type="attr" name="listPreferredItemPaddingEnd" />
2012-
<public type="attr" name="singleUser" />
2013-
<public type="attr" name="presentationTheme" />
2014-
<public type="attr" name="subtypeId"/>
2015-
<public type="attr" name="initialKeyguardLayout" />
2016-
<public type="attr" name="widgetFeatures" />
2017-
<public type="attr" name="widgetCategory" />
2018-
<public type="attr" name="permissionGroupFlags" />
2019-
<public type="attr" name="labelFor" />
2020-
<public type="attr" name="permissionFlags" />
1996+
<public type="attr" name="supportsRtl" id="0x010103af" />
1997+
<public type="attr" name="textDirection" id="0x010103b0" />
1998+
<public type="attr" name="textAlignment" id="0x010103b1" />
1999+
<public type="attr" name="layoutDirection" id="0x010103b2" />
2000+
<public type="attr" name="paddingStart" id="0x010103b3" />
2001+
<public type="attr" name="paddingEnd" id="0x010103b4" />
2002+
<public type="attr" name="layout_marginStart" id="0x010103b5" />
2003+
<public type="attr" name="layout_marginEnd" id="0x010103b6" />
2004+
<public type="attr" name="layout_toStartOf" id="0x010103b7" />
2005+
<public type="attr" name="layout_toEndOf" id="0x010103b8" />
2006+
<public type="attr" name="layout_alignStart" id="0x010103b9" />
2007+
<public type="attr" name="layout_alignEnd" id="0x010103ba" />
2008+
<public type="attr" name="layout_alignParentStart" id="0x010103bb" />
2009+
<public type="attr" name="layout_alignParentEnd" id="0x010103bc" />
2010+
<public type="attr" name="listPreferredItemPaddingStart" id="0x010103bd" />
2011+
<public type="attr" name="listPreferredItemPaddingEnd" id="0x010103be" />
2012+
<public type="attr" name="singleUser" id="0x010103bf" />
2013+
<public type="attr" name="presentationTheme" id="0x010103c0" />
2014+
<public type="attr" name="subtypeId" id="0x010103c1" />
2015+
<public type="attr" name="initialKeyguardLayout" id="0x010103c2" />
2016+
<public type="attr" name="widgetFeatures" id="0x010103c3" />
2017+
<public type="attr" name="widgetCategory" id="0x010103c4" />
2018+
<public type="attr" name="permissionGroupFlags" id="0x010103c5" />
2019+
<public type="attr" name="labelFor" id="0x010103c6" />
2020+
<public type="attr" name="permissionFlags" id="0x010103c7" />
20212021

2022+
2023+
<!-- ===============================================================
2024+
Resources added in next version of platform
2025+
=============================================================== -->
2026+
20222027
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public ConstantState getConstantState() {
239239
return null;
240240
}
241241

242+
/** @hide */
242243
@Override
243244
public void setLayoutDirection(int layoutDirection) {
244245
mClipState.mDrawable.setLayoutDirection(layoutDirection);

graphics/java/android/graphics/drawable/LayerDrawable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ public Drawable mutate() {
590590
return this;
591591
}
592592

593+
/** @hide */
593594
@Override
594595
public void setLayoutDirection(int layoutDirection) {
595596
if (getLayoutDirection() != layoutDirection) {

graphics/java/android/graphics/drawable/StateListDrawable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public Drawable mutate() {
261261
return this;
262262
}
263263

264+
/** @hide */
264265
@Override
265266
public void setLayoutDirection(int layoutDirection) {
266267
final int numStates = getStateCount();

0 commit comments

Comments
 (0)