Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc062a9 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 

* commit 'dbed514e':
  Fix bug #7172699
parents ca10e561 dbed514e

core/java/android/view/Gravity.java

+6 −6
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ public class Gravity 
     *                container.

     * @param layoutDirection The layout direction.

     *

     * @see {@link View#LAYOUT_DIRECTION_LTR}

     * @see {@link View#LAYOUT_DIRECTION_RTL}

     * @see View#LAYOUT_DIRECTION_LTR

     * @see View#LAYOUT_DIRECTION_RTL

     */

    public static void apply(int gravity, int w, int h, Rect container,

            Rect outRect, int layoutDirection) {
@@ -290,8 +290,8 @@ public class Gravity 
     *                container.

     * @param layoutDirection The layout direction.

     *

     * @see {@link View#LAYOUT_DIRECTION_LTR}

     * @see {@link View#LAYOUT_DIRECTION_RTL}

     * @see View#LAYOUT_DIRECTION_LTR

     * @see View#LAYOUT_DIRECTION_RTL

     */

    public static void apply(int gravity, int w, int h, Rect container,

                             int xAdj, int yAdj, Rect outRect, int layoutDirection) {
@@ -370,8 +370,8 @@ public class Gravity 
     * modified if needed to fit in the display.

     * @param layoutDirection The layout direction.

     *

     * @see {@link View#LAYOUT_DIRECTION_LTR}

     * @see {@link View#LAYOUT_DIRECTION_RTL}

     * @see View#LAYOUT_DIRECTION_LTR

     * @see View#LAYOUT_DIRECTION_RTL

     */

    public static void applyDisplay(int gravity, Rect display, Rect inoutObj, int layoutDirection) {

        int absGravity = getAbsoluteGravity(gravity, layoutDirection);

core/java/android/view/View.java

+4 −4
Original line number Diff line number Diff line
@@ -11605,8 +11605,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @param layoutDirection the direction of the layout

     *

     * @see {@link #LAYOUT_DIRECTION_LTR}

     * @see {@link #LAYOUT_DIRECTION_RTL}

     * @see #LAYOUT_DIRECTION_LTR

     * @see #LAYOUT_DIRECTION_RTL

     */

    public void onPaddingChanged(int layoutDirection) {

    }
@@ -14053,8 +14053,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @param layoutDirection The resolved layout direction.

     *

     * @see {@link #LAYOUT_DIRECTION_LTR}

     * @see {@link #LAYOUT_DIRECTION_RTL}

     * @see #LAYOUT_DIRECTION_LTR

     * @see #LAYOUT_DIRECTION_RTL

     */

    public void onResolveDrawables(int layoutDirection) {

    }