atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "View: call onLayout() only on size change or on request"

Browse Source 
This reverts commit b33a470c7b.

This commit was added as fix for layout recreation loops, but this is no
longer a problem, since ViewGroup.detachViewFromParent() has been
improved. The first fix is no longer needed and it seems to cause some
minor regressions, so we revert it.
This commit is contained in:
Julian Winkler
2025-03-25 19:59:25 +01:00
parent caa4700487
commit 15a6432d01
3 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/api-impl/android/view/View.java
View File

@@ -848,7 +848,6 @@ public class View implements Drawable.Callback {
private int oldWidthMeasureSpec = -1;
private int oldHeightMeasureSpec = -1;
private boolean layoutRequested = true;
private boolean layoutPending = true;
private int oldWidth;
private int oldHeight;
protected boolean haveCustomMeasure = true;
@@ -1372,7 +1371,6 @@ public class View implements Drawable.Callback {
oldHeightMeasureSpec = heightMeasureSpec;
onMeasure(widthMeasureSpec, heightMeasureSpec);
layoutRequested = false;
layoutPending = true;
}
}
@@ -1448,10 +1446,8 @@ public class View implements Drawable.Callback {
native_layout(widget, l, t, r, b);
}
/** Helper function to be called from GTK's LayoutManager via JNI
* @return true if the layout changed
*/
private boolean layoutInternal(int width, int height) {
/** Helper function to be called from GTKs LayoutManager via JNI */
private void layoutInternal(int width, int height) {
// if the layout is triggered from a native widget, we might not have measured yet
if (width != getMeasuredWidth() || height != getMeasuredHeight()) {
measure(width | MeasureSpec.EXACTLY, height | MeasureSpec.EXACTLY);
@@ -1461,15 +1457,9 @@ public class View implements Drawable.Callback {
onSizeChanged(width, height, oldWidth, oldHeight);
bottom = top + height;
right = left + width;
if (changed || layoutPending) {
layoutPending = false;
onLayout(changed, 0, 0, width, height);
oldWidth = width;
oldHeight = height;
return true;
} else {
return false;
}
onLayout(changed, 0, 0, width, height);
oldWidth = width;
oldHeight = height;
}
public int getLeft() {