aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Memory Leak] Fix leak of LauncherAppWidgetHostView via StateManager.StateListener

Browse Source 
Rather than register a StateListener for each LauncherAppWidgetHostView, just register one StateListener which, upon launcher state is changed to NORMAL, iterate over all child views under Workspace and perform a11y action if view tag is set.

Fix: 397978703
Test: presubmit
Flag: EXEMPT bug fix
Change-Id: I044d012b74eaa5356196c5503318fa8ab389ec46
This commit is contained in:
Fengjiang Li
2025-02-20 21:55:05 -08:00
parent 4d9ce7c953
commit e0553d7da3
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/android/launcher3/Workspace.java
View File

@@ -53,6 +53,7 @@ import android.graphics.Point;
import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.Log;
@@ -299,6 +300,17 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
private final StatsLogManager mStatsLogManager;
private final MSDLPlayerWrapper mMSDLPlayerWrapper;
private final StateManager.StateListener<LauncherState> mAccessibilityDropListener =
new StateListener<>() {
@Override
public void onStateTransitionComplete(LauncherState finalState) {
if (finalState == NORMAL) {
performAccessibilityActionOnViewTree(Workspace.this);
}
}
};
@Nullable
private DragController.DragListener mAccessibilityDragListener;
@@ -1454,11 +1466,13 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
super.onAttachedToWindow();
mWallpaperOffset.setWindowToken(getWindowToken());
computeScroll();
mLauncher.getStateManager().addStateListener(mAccessibilityDropListener);
}
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mWallpaperOffset.setWindowToken(null);
mLauncher.getStateManager().removeStateListener(mAccessibilityDropListener);
}
@Override
@@ -2239,16 +2253,8 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
// the order of operations in this method related to the StateListener below, please
// test that accessibility moves retain focus after accessibility dropping an item.
// Accessibility focus must be requested after launcher is back to a normal state
mLauncher.getStateManager().addStateListener(new StateListener<LauncherState>() {
@Override
public void onStateTransitionComplete(LauncherState finalState) {
if (finalState == NORMAL) {
cell.performAccessibilityAction(
AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
mLauncher.getStateManager().removeStateListener(this);
}
}
});
cell.setTag(R.id.perform_a11y_action_on_launcher_state_normal_tag,
AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
}
}
@@ -3580,4 +3586,22 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
onEndStateTransition();
}
}
/**
* Recursively check view tag {@link R.id.perform_a11y_action_on_launcher_state_normal_tag} and
* call {@link View#performAccessibilityAction(int, Bundle)} on view tree. The tag is cleared
* after this call.
*/
private static void performAccessibilityActionOnViewTree(View view) {
Object tag = view.getTag(R.id.perform_a11y_action_on_launcher_state_normal_tag);
if (tag instanceof Integer) {
view.performAccessibilityAction((int) tag, null);
view.setTag(R.id.perform_a11y_action_on_launcher_state_normal_tag, null);
}
if (view instanceof ViewGroup viewgroup) {
for (int i = 0; i < viewgroup.getChildCount(); i++) {
performAccessibilityActionOnViewTree(viewgroup.getChildAt(i));
}
}
}
}