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

Commit de35ceee authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #4509967 (layout_gravity not always respected) 

- fix FrameLayout
- code refactoring on LinearLayout
- add more unit tests

Change-Id: I49302582c61aa31a4eb7eded92327b10408f71a4
parent 0d8f66f0

core/java/android/widget/FrameLayout.java

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.widget;



import java.util.ArrayList;



import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Canvas;
@@ -23,14 +25,12 @@ import android.graphics.Rect; 
import android.graphics.Region;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.View;

import android.view.ViewDebug;

import android.view.ViewGroup;

import android.view.Gravity;

import android.widget.RemoteViews.RemoteView;



import java.util.ArrayList;





/**

 * FrameLayout is designed to block out an area on the screen to display
@@ -364,10 +364,10 @@ public class FrameLayout extends ViewGroup { 
                    gravity = DEFAULT_CHILD_GRAVITY;

                }



                final int horizontalGravity = Gravity.getAbsoluteGravity(gravity, isLayoutRtl());

                final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, isLayoutRtl());

                final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;



                switch (horizontalGravity) {

                switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {

                    case Gravity.LEFT:

                        childLeft = parentLeft + lp.leftMargin;

                        break;

core/java/android/widget/LinearLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -1430,8 +1430,8 @@ public class LinearLayout extends ViewGroup { 
                if (gravity < 0) {

                    gravity = minorGravity;

                }

                gravity = Gravity.getAbsoluteGravity(gravity, isLayoutRtl());

                switch (gravity & Gravity.HORIZONTAL_GRAVITY_MASK) {

                final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, isLayoutRtl());

                switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {

                    case Gravity.CENTER_HORIZONTAL:

                        childLeft = paddingLeft + ((childSpace - childWidth) / 2)

                                + lp.leftMargin - lp.rightMargin;

tests/BiDiTests/AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -57,6 +57,20 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".BiDiTestFrameLayoutLtrActivity"

                  android:windowSoftInputMode="stateAlwaysHidden">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </activity>



        <activity android:name=".BiDiTestFrameLayoutRtlActivity"

                  android:windowSoftInputMode="stateAlwaysHidden">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </activity>



    </application>



</manifest>
 
 No newline at end of file

tests/BiDiTests/res/layout/frame_layout_ltr.xml

0 → 100644
+81 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/frame_layout_ltr"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:horizontalDirection="ltr"

    android:background="#FF000000">



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="right|center_vertical"

            android:background="#FFFF0000">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="left|center_vertical"

            android:background="#FF00FF00">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|center_horizontal"

            android:background="#FF0000FF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|center_horizontal"

            android:background="#FF00FFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|before"

            android:background="#FFFFFFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|after"

            android:background="#FFFFFF00">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|before"

            android:background="#FFFFFFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|after"

            android:background="#FFFFFF00">

        </RelativeLayout>



</FrameLayout>

tests/BiDiTests/res/layout/frame_layout_rtl.xml

0 → 100644
+81 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/frame_layout_rtl"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:horizontalDirection="rtl"

    android:background="#FF000000">



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="right|center_vertical"

            android:background="#FFFF0000">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="left|center_vertical"

            android:background="#FF00FF00">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|center_horizontal"

            android:background="#FF0000FF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|center_horizontal"

            android:background="#FF00FFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|before"

            android:background="#FFFFFFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="top|after"

            android:background="#FFFFFF00">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|before"

            android:background="#FFFFFFFF">

        </RelativeLayout>



        <RelativeLayout

            android:layout_width="100dp"

            android:layout_height="100dp"

            android:layout_gravity="bottom|after"

            android:background="#FFFFFF00">

        </RelativeLayout>



</FrameLayout>