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

View: make sure onDetachedFromWindow() gets called before updating attachedToWindow property

Browse Source
This commit is contained in:
Julian Winkler
2025-02-18 19:04:18 +01:00
parent 24f839f556
commit 2374d44b0f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1876,13 +1876,17 @@ public class View implements Drawable.Callback {
native_keep_screen_on(widget, true); native_keep_screen_on(widget, true);
} }
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
attachedToWindow = false;
if (onAttachStateChangeListener != null) { if (onAttachStateChangeListener != null) {
onAttachStateChangeListener.onViewDetachedFromWindow(this); onAttachStateChangeListener.onViewDetachedFromWindow(this);
} }
if (keepScreenOn) if (keepScreenOn)
native_keep_screen_on(widget, false); native_keep_screen_on(widget, false);
} }
void detachFromWindowInternal() {
onDetachedFromWindow();
attachedToWindow = false;
}
public void attachToWindowInternal() { public void attachToWindowInternal() {
onAttachedToWindow(); onAttachedToWindow();
} }

10
src/api-impl/android/view/ViewGroup.java
View File

@@ -103,7 +103,7 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
children.remove(child); children.remove(child);
native_removeView(widget, child.widget); native_removeView(widget, child.widget);
if (isAttachedToWindow()) if (isAttachedToWindow())
child.onDetachedFromWindow(); child.detachFromWindowInternal();
if (onHierarchyChangeListener != null) { if (onHierarchyChangeListener != null) {
onHierarchyChangeListener.onChildViewRemoved(this, child); onHierarchyChangeListener.onChildViewRemoved(this, child);
} }
@@ -128,7 +128,7 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
it.remove(); it.remove();
native_removeView(widget, child.widget); native_removeView(widget, child.widget);
if (isAttachedToWindow()) if (isAttachedToWindow())
child.onDetachedFromWindow(); child.detachFromWindowInternal();
if (onHierarchyChangeListener != null) { if (onHierarchyChangeListener != null) {
onHierarchyChangeListener.onChildViewRemoved(this, child); onHierarchyChangeListener.onChildViewRemoved(this, child);
} }
@@ -332,10 +332,10 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
} }
@Override @Override
protected void onDetachedFromWindow() { protected void detachFromWindowInternal() {
super.onDetachedFromWindow(); super.detachFromWindowInternal();
for (View child: children) { for (View child: children) {
child.onDetachedFromWindow(); child.detachFromWindowInternal();
} }
} }