jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android activity tracking uses root view resolver as sole source of truth

Browse Source 
Summary:
The previous approach was to append any 'extra/floating' root view to the end of the childrens for the application descriptor. But the active child was always the last view so if there was a 'floating' decor view with no activity it would always be the active child, even if you opened a real activity from it. This was possible to do in FB4a and you could get into a situation where you couldn't see the top most activity.

New approach is to only iterate the root views from the resolver since it contains everything and map to activity if possible.

Reviewed By: lblasa

Differential Revision: D41731951

fbshipit-source-id: 9ef3fcfdaa41e9b07606ca6781cf22482b54e072
This commit is contained in:
Luke De Feo
2022-12-05 07:07:44 -08:00
committed by Facebook GitHub Bot
parent 00334acb2b
commit faac3dddfb
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ApplicationRefDescriptor.kt
View File

@@ -9,6 +9,7 @@ package com.facebook.flipper.plugins.uidebugger.descriptors
import android.app.Activity
import android.view.View
import android.view.ViewGroup
import com.facebook.flipper.plugins.uidebugger.core.ApplicationRef
import com.facebook.flipper.plugins.uidebugger.model.Bounds
import com.facebook.flipper.plugins.uidebugger.util.DisplayMetrics
@@ -34,17 +35,21 @@ object ApplicationRefDescriptor : ChainedDescriptor<ApplicationRef>() {
val activeRoots = node.rootsResolver.rootViews()
val added = mutableSetOf<View>()
for (activity: Activity in node.activitiesStack) {
children.add(activity)
added.add(activity.window.decorView)
}
val decorViewToActivity: Map<View, Activity> =
node.activitiesStack.toList().map { it.window.decorView to it }.toMap()
// Picks up root views not tied to an activity (dialogs)
for (root in activeRoots) {
if (!added.contains(root)) {
children.add(root)
added.add(root)
// if there is an activity for this root view use that,
// if not just return the mystery floating decor view
val activity = decorViewToActivity[root]
if (activity != null) {
children.add(activity)
} else {
if (root is ViewGroup && root.childCount > 0) {
// sometimes there is a root view on top that has no children and we dont want to add
// these as they will become active
children.add(root)
}
}
}