Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #7172699" into jb-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-18 14:46:59 -07:00
committed by Android (Google) Code Review
parent 94998c9c4e 49b0a9b470
commit dbed514e13
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/Gravity.java
View File

@@ -153,8 +153,8 @@ public class Gravity
* container. * container.
* @param layoutDirection The layout direction. * @param layoutDirection The layout direction.
* *
* @see {@link View#LAYOUT_DIRECTION_LTR} * @see View#LAYOUT_DIRECTION_LTR
* @see {@link View#LAYOUT_DIRECTION_RTL} * @see View#LAYOUT_DIRECTION_RTL
*/ */
public static void apply(int gravity, int w, int h, Rect container, public static void apply(int gravity, int w, int h, Rect container,
Rect outRect, int layoutDirection) { Rect outRect, int layoutDirection) {
@@ -290,8 +290,8 @@ public class Gravity
* container. * container.
* @param layoutDirection The layout direction. * @param layoutDirection The layout direction.
* *
* @see {@link View#LAYOUT_DIRECTION_LTR} * @see View#LAYOUT_DIRECTION_LTR
* @see {@link View#LAYOUT_DIRECTION_RTL} * @see View#LAYOUT_DIRECTION_RTL
*/ */
public static void apply(int gravity, int w, int h, Rect container, public static void apply(int gravity, int w, int h, Rect container,
int xAdj, int yAdj, Rect outRect, int layoutDirection) { int xAdj, int yAdj, Rect outRect, int layoutDirection) {
@@ -370,8 +370,8 @@ public class Gravity
* modified if needed to fit in the display. * modified if needed to fit in the display.
* @param layoutDirection The layout direction. * @param layoutDirection The layout direction.
* *
* @see {@link View#LAYOUT_DIRECTION_LTR} * @see View#LAYOUT_DIRECTION_LTR
* @see {@link View#LAYOUT_DIRECTION_RTL} * @see View#LAYOUT_DIRECTION_RTL
*/ */
public static void applyDisplay(int gravity, Rect display, Rect inoutObj, int layoutDirection) { public static void applyDisplay(int gravity, Rect display, Rect inoutObj, int layoutDirection) {
int absGravity = getAbsoluteGravity(gravity, layoutDirection); int absGravity = getAbsoluteGravity(gravity, layoutDirection);

8
core/java/android/view/View.java
View File

@@ -11605,8 +11605,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* *
* @param layoutDirection the direction of the layout * @param layoutDirection the direction of the layout
* *
* @see {@link #LAYOUT_DIRECTION_LTR} * @see #LAYOUT_DIRECTION_LTR
* @see {@link #LAYOUT_DIRECTION_RTL} * @see #LAYOUT_DIRECTION_RTL
*/ */
public void onPaddingChanged(int layoutDirection) { public void onPaddingChanged(int layoutDirection) {
} }
@@ -14053,8 +14053,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* *
* @param layoutDirection The resolved layout direction. * @param layoutDirection The resolved layout direction.
* *
* @see {@link #LAYOUT_DIRECTION_LTR} * @see #LAYOUT_DIRECTION_LTR
* @see {@link #LAYOUT_DIRECTION_RTL} * @see #LAYOUT_DIRECTION_RTL
*/ */
public void onResolveDrawables(int layoutDirection) { public void onResolveDrawables(int layoutDirection) {
} }