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

Commit 85d28a00 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Replace left/right with start/end for Gravity / LayoutParams / Padding"

parents b6a45cb9 aac0d4ed

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ public abstract class WallpaperService extends Service { 


                    if (!mCreated) {

                        mLayout.type = mIWallpaperEngine.mWindowType;

                        mLayout.gravity = Gravity.LEFT|Gravity.TOP;

                        mLayout.gravity = Gravity.START|Gravity.TOP;

                        mLayout.setTitle(WallpaperService.this.getClass().getName());

                        mLayout.windowAnimations =

                                com.android.internal.R.style.Animation_Wallpaper;

core/java/android/view/SurfaceView.java

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ public class SurfaceView extends View { 
                if (mWindow == null) {

                    mWindow = new MyWindow(this);

                    mLayout.type = mWindowType;

                    mLayout.gravity = Gravity.LEFT|Gravity.TOP;

                    mLayout.gravity = Gravity.START|Gravity.TOP;

                    mSession.addWithoutInputChannel(mWindow, mWindow.mSeq, mLayout,

                            mVisible ? VISIBLE : GONE, mContentInsets);

                }

core/java/android/webkit/ZoomControlEmbedded.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class ZoomControlEmbedded implements ZoomControlBase { 
            View controls = mZoomButtonsController.getZoomControls();

            ViewGroup.LayoutParams params = controls.getLayoutParams();

            if (params instanceof FrameLayout.LayoutParams) {

                ((FrameLayout.LayoutParams) params).gravity = Gravity.RIGHT;

                ((FrameLayout.LayoutParams) params).gravity = Gravity.END;

            }

        }

        return mZoomButtonsController;

core/java/android/widget/FrameLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import android.widget.RemoteViews.RemoteView; 
 */

@RemoteView

public class FrameLayout extends ViewGroup {

    private static final int DEFAULT_CHILD_GRAVITY = Gravity.TOP | Gravity.LEFT;

    private static final int DEFAULT_CHILD_GRAVITY = Gravity.TOP | Gravity.START;



    @ViewDebug.ExportedProperty(category = "measurement")

    boolean mMeasureAllChildren = false;

core/java/android/widget/PopupWindow.java

+4 −4
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ public class PopupWindow { 
       

        preparePopup(p);

        if (gravity == Gravity.NO_GRAVITY) {

            gravity = Gravity.TOP | Gravity.LEFT;

            gravity = Gravity.TOP | Gravity.START;

        }

        p.gravity = gravity;

        p.x = x;
@@ -1003,7 +1003,7 @@ public class PopupWindow { 
        // screen. The view is then positioned to the appropriate location

        // by setting the x and y offsets to match the anchor's bottom

        // left corner

        p.gravity = Gravity.LEFT | Gravity.TOP;

        p.gravity = Gravity.START | Gravity.TOP;

        p.width = mLastWidth = mWidth;

        p.height = mLastHeight = mHeight;

        if (mBackground != null) {
@@ -1100,7 +1100,7 @@ public class PopupWindow { 
        

        boolean onTop = false;



        p.gravity = Gravity.LEFT | Gravity.TOP;

        p.gravity = Gravity.START | Gravity.TOP;

        

        anchor.getLocationOnScreen(mScreenLocation);

        final Rect displayFrame = new Rect();
@@ -1134,7 +1134,7 @@ public class PopupWindow { 
            onTop = (displayFrame.bottom - mScreenLocation[1] - anchor.getHeight() - yoff) <

                    (mScreenLocation[1] - yoff - displayFrame.top);

            if (onTop) {

                p.gravity = Gravity.LEFT | Gravity.BOTTOM;

                p.gravity = Gravity.START | Gravity.BOTTOM;

                p.y = root.getHeight() - mDrawingLocation[1] + yoff;

            } else {

                p.y = mDrawingLocation[1] + anchor.getHeight() + yoff;