LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Consider windows with alpha=0 as invisible" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-16 10:22:36 +00:00
committed by Android (Google) Code Review
parent b184ea69d7 ccd908b3f8
commit 866c1f5d04
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/winscope/src/flickerlib/common.js
View File

@@ -42,6 +42,8 @@ const WindowConfiguration = require('flicker').com.android.server.wm.traces.comm
windowmanager.windows.WindowConfiguration;
const WindowContainer = require('flicker').com.android.server.wm.traces.common.
windowmanager.windows.WindowContainer;
const WindowLayoutParams= require('flicker').com.android.server.wm.traces.common.
windowmanager.windows.WindowLayoutParams;
const WindowManagerPolicy = require('flicker').com.android.server.wm.traces.common.
windowmanager.windows.WindowManagerPolicy;
const WindowState = require('flicker').com.android.server.wm.traces.common.
@@ -72,6 +74,7 @@ export {
WindowContainer,
WindowState,
WindowToken,
WindowLayoutParams,
WindowManagerPolicy,
WindowManagerTrace,
WindowManagerState,

45
tools/winscope/src/flickerlib/windows/WindowState.ts
View File

@@ -16,7 +16,7 @@
import { getWMPropertiesForDisplay, shortenName } from '../mixin'
import { asRawTreeViewObject } from '../../utils/diff.js'
import { toRect, WindowState } from "../common"
import { toRect, WindowState, WindowLayoutParams } from "../common"
import { VISIBLE_CHIP } from '../treeview/Chips'
import WindowContainer from "./WindowContainer"
@@ -56,7 +56,7 @@ import WindowContainer from "./WindowContainer"
}
const entry = new WindowState(
proto.attributes?.type ?? 0,
newWindowLayoutParams(proto.attributes),
proto.displayId,
proto.stackId,
proto.animator?.surface?.layer ?? 0,
@@ -77,10 +77,10 @@ import WindowContainer from "./WindowContainer"
entry.rects.map((rect) => rect.ref = entry)
entry.obj = getWMPropertiesForDisplay(proto)
entry.shortName = shortenName(entry.name)
entry.visible = entry.isSurfaceShown ?? false
entry.chips = entry.isSurfaceShown ? [VISIBLE_CHIP] : []
entry.visible = entry.isVisible ?? false
entry.chips = entry.isVisible ? [VISIBLE_CHIP] : []
entry.children = entry.childrenWindows
if (entry.isSurfaceShown) {
if (entry.visible) {
entry.rect = entry.rects[0]
}
entry.rawTreeViewObject = asRawTreeViewObject(entry)
@@ -88,4 +88,39 @@ import WindowContainer from "./WindowContainer"
}
}
function newWindowLayoutParams(proto): WindowLayoutParams {
return new WindowLayoutParams(
/* type */ proto?.type ?? 0,
/* x */ proto?.x ?? 0,
/* y */ proto?.y ?? 0,
/* width */ proto?.width ?? 0,
/* height */ proto?.height ?? 0,
/* horizontalMargin */ proto?.horizontalMargin ?? 0,
/* verticalMargin */ proto?.verticalMargin ?? 0,
/* gravity */ proto?.gravity ?? 0,
/* softInputMode */ proto?.softInputMode ?? 0,
/* format */ proto?.format ?? 0,
/* windowAnimations */ proto?.windowAnimations ?? 0,
/* alpha */ proto?.alpha ?? 0,
/* screenBrightness */ proto?.screenBrightness ?? 0,
/* buttonBrightness */ proto?.buttonBrightness ?? 0,
/* rotationAnimation */ proto?.rotationAnimation ?? 0,
/* preferredRefreshRate */ proto?.preferredRefreshRate ?? 0,
/* preferredDisplayModeId */ proto?.preferredDisplayModeId ?? 0,
/* hasSystemUiListeners */ proto?.hasSystemUiListeners ?? false,
/* inputFeatureFlags */ proto?.inputFeatureFlags ?? 0,
/* userActivityTimeout */ proto?.userActivityTimeout ?? 0,
/* colorMode */ proto?.colorMode ?? 0,
/* flags */ proto?.flags ?? 0,
/* privateFlags */ proto?.privateFlags ?? 0,
/* systemUiVisibilityFlags */ proto?.systemUiVisibilityFlags ?? 0,
/* subtreeSystemUiVisibilityFlags */ proto?.subtreeSystemUiVisibilityFlags ?? 0,
/* appearance */ proto?.appearance ?? 0,
/* behavior */ proto?.behavior ?? 0,
/* fitInsetsTypes */ proto?.fitInsetsTypes ?? 0,
/* fitInsetsSides */ proto?.fitInsetsSides ?? 0,
/* fitIgnoreVisibility */ proto?.fitIgnoreVisibility ?? false
)
}
export default WindowState