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

Commit 2dd20a61 authored by Yigit Boyar's avatar Yigit Boyar
Browse files

Target API check for margin params fix 

Prior to N, our widgets were not converting MarginLayoutParams
properly between ViewGroups. The fix intrudced some issues in
older apps as the broken conversion code would hide developer
errors. This CL guards the change with a target API check so
that we don't affect older apps.

Bug: 30378230
Change-Id: I215281d261b553c3b4cedcd29ea0a861df809471
parent 41e185e7

core/java/android/view/View.java

+15 −0
Original line number Diff line number Diff line
@@ -820,6 +820,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    static boolean sTextureViewIgnoresDrawableSetters = false;













    /**













     * Prior to N, some ViewGroups would not convert LayoutParams properly even though both extend













     * MarginLayoutParams. For instance, converting LinearLayout.LayoutParams to













     * RelativeLayout.LayoutParams would lose margin information. This is fixed on N but target API













     * check is implemented for backwards compatibility.













     *













     * {@hide}













     */













    protected static boolean sPreserveMarginParamsInLayoutParamConversion;







































    /**















     * This view does not want keystrokes. Use with TAKES_FOCUS_MASK when















     * calling setFlags.










@@ -4052,6 +4063,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            // On N+, we throw, but that breaks compatibility with apps that use these methods.















            sTextureViewIgnoresDrawableSetters = targetSdkVersion <= M;



























            // Prior to N, we would drop margins in LayoutParam conversions. The fix triggers bugs













            // in apps so we target check it to avoid breaking existing apps.













            sPreserveMarginParamsInLayoutParamConversion = targetSdkVersion >= N;



























            sCompatibilityDone = true;















        }















    }

































core/java/android/widget/FrameLayout.java



+7
−6




























Original line number
Diff line number
Diff line








@@ -382,14 +382,15 @@ public class FrameLayout extends ViewGroup {





























    @Override















    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {













        if (sPreserveMarginParamsInLayoutParamConversion) {















            if (lp instanceof LayoutParams) {















                return new LayoutParams((LayoutParams) lp);















            } else if (lp instanceof MarginLayoutParams) {















                return new LayoutParams((MarginLayoutParams) lp);













        } else {













            return new LayoutParams(lp);















            }















        }













        return new LayoutParams(lp);













    }































    @Override















    public CharSequence getAccessibilityClassName() {

































core/java/android/widget/GridLayout.java



+7
−6




























Original line number
Diff line number
Diff line








@@ -868,14 +868,15 @@ public class GridLayout extends ViewGroup {





























    @Override















    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {













        if (sPreserveMarginParamsInLayoutParamConversion) {















            if (lp instanceof LayoutParams) {















                return new LayoutParams((LayoutParams) lp);















            } else if (lp instanceof MarginLayoutParams) {















                return new LayoutParams((MarginLayoutParams) lp);













        } else {













            return new LayoutParams(lp);















            }















        }













        return new LayoutParams(lp);













    }































    // Draw grid

















































core/java/android/widget/LinearLayout.java



+7
−6




























Original line number
Diff line number
Diff line








@@ -1844,14 +1844,15 @@ public class LinearLayout extends ViewGroup {





























    @Override















    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {













        if (sPreserveMarginParamsInLayoutParamConversion) {















            if (lp instanceof LayoutParams) {















                return new LayoutParams((LayoutParams) lp);















            } else if (lp instanceof MarginLayoutParams) {















                return new LayoutParams((MarginLayoutParams) lp);













        } else {













            return new LayoutParams(lp);















            }















        }













        return new LayoutParams(lp);













    }















































    // Override to allow type-checking of LayoutParams.

































core/java/android/widget/RelativeLayout.java



+7
−6




























Original line number
Diff line number
Diff line








@@ -1104,14 +1104,15 @@ public class RelativeLayout extends ViewGroup {





























    @Override















    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {













        if (sPreserveMarginParamsInLayoutParamConversion) {















            if (lp instanceof LayoutParams) {















                return new LayoutParams((LayoutParams) lp);















            } else if (lp instanceof MarginLayoutParams) {















                return new LayoutParams((MarginLayoutParams) lp);













        } else {













            return new LayoutParams(lp);















            }















        }













        return new LayoutParams(lp);













    }































    /** @hide */















    @Override