From a3d891dab622e24984552bfbb5d67b21fa2206e6 Mon Sep 17 00:00:00 2001 From: Kean Mariotti Date: Wed, 4 Jan 2023 10:36:26 +0000 Subject: [PATCH] Reorganize src/common package - Move src/common/trace => src/trace (make its own package) - Move src/common/utils => src/common Fix: b/264362866 Test: npm run build:all && npm run test:all Change-Id: I9941997d1f0f7ef5558ed75a56d48acba69e39a3 --- .../abt_chrome_extension_protocol.ts | 2 +- .../abt_chrome_extension_protocol_stub.ts | 2 +- tools/winscope/src/app/components/app_component.ts | 8 ++++---- .../src/app/components/collect_traces_component.ts | 4 ++-- .../timeline/expanded_timeline_component.ts | 2 +- .../app/components/timeline/mini_canvas_drawer.ts | 2 +- .../components/timeline/mini_timeline_component.ts | 4 ++-- .../app/components/timeline/timeline_component.ts | 6 +++--- .../components/timeline/timeline_component_stub.ts | 2 +- .../components/timeline/timeline_component_test.ts | 4 ++-- .../winscope/src/app/components/timeline/utils.ts | 2 +- .../src/app/components/trace_view_component.ts | 2 +- .../src/app/components/upload_traces_component.ts | 4 ++-- tools/winscope/src/app/mediator.ts | 4 ++-- tools/winscope/src/app/mediator_test.ts | 4 ++-- tools/winscope/src/app/timeline_data.ts | 12 ++++++------ tools/winscope/src/app/timeline_data_test.ts | 4 ++-- tools/winscope/src/app/trace_data.ts | 12 ++++++------ tools/winscope/src/app/trace_data_test.ts | 6 +++--- tools/winscope/src/app/trace_icons.ts | 2 +- tools/winscope/src/app/trace_info.ts | 2 +- .../winscope/src/common/{utils => }/array_utils.ts | 0 .../src/common/{utils => }/array_utils_test.ts | 0 .../winscope/src/common/{utils => }/file_utils.ts | 0 .../src/common/{utils => }/function_utils.ts | 0 .../src/common/{utils => }/global_config.ts | 0 .../src/common/{utils => }/persistent_store.ts | 0 .../common/{utils => }/persistent_store_proxy.ts | 0 .../{utils => }/persistent_store_proxy_test.ts | 0 .../winscope/src/common/{utils => }/time_utils.ts | 2 +- .../src/common/{utils => }/time_utils_test.ts | 2 +- .../winscope/src/common/{utils => }/tree_utils.ts | 0 .../winscope/src/cross_tool/cross_tool_protocol.ts | 4 ++-- .../src/cross_tool/cross_tool_protocol_stub.ts | 4 ++-- tools/winscope/src/cross_tool/origin_allow_list.ts | 2 +- .../src/interfaces/remote_bugreport_receiver.ts | 2 +- .../src/interfaces/remote_timestamp_receiver.ts | 2 +- .../src/interfaces/remote_timestamp_sender.ts | 2 +- .../src/interfaces/timestamp_change_listener.ts | 2 +- tools/winscope/src/main_dev.ts | 2 +- tools/winscope/src/parsers/parser.ts | 8 ++++---- tools/winscope/src/parsers/parser_accessibility.ts | 6 +++--- .../src/parsers/parser_accessibility_test.ts | 4 ++-- tools/winscope/src/parsers/parser_common_test.ts | 6 +++--- tools/winscope/src/parsers/parser_factory.ts | 6 +++--- .../src/parsers/parser_input_method_clients.ts | 10 +++++----- .../parsers/parser_input_method_clients_test.ts | 4 ++-- .../parsers/parser_input_method_manager_service.ts | 10 +++++----- .../parser_input_method_manager_service_test.ts | 4 ++-- .../src/parsers/parser_input_method_service.ts | 10 +++++----- .../parsers/parser_input_method_service_test.ts | 4 ++-- tools/winscope/src/parsers/parser_protolog.ts | 8 ++++---- tools/winscope/src/parsers/parser_protolog_test.ts | 6 +++--- .../src/parsers/parser_screen_recording.ts | 12 ++++++------ .../src/parsers/parser_screen_recording_legacy.ts | 10 +++++----- .../parsers/parser_screen_recording_legacy_test.ts | 6 +++--- .../src/parsers/parser_screen_recording_test.ts | 6 +++--- .../winscope/src/parsers/parser_surface_flinger.ts | 8 ++++---- .../parsers/parser_surface_flinger_dump_test.ts | 6 +++--- .../src/parsers/parser_surface_flinger_test.ts | 8 ++++---- tools/winscope/src/parsers/parser_transactions.ts | 8 ++++---- .../src/parsers/parser_transactions_test.ts | 6 +++--- .../winscope/src/parsers/parser_window_manager.ts | 8 ++++---- .../src/parsers/parser_window_manager_dump.ts | 8 ++++---- .../src/parsers/parser_window_manager_dump_test.ts | 6 +++--- .../src/parsers/parser_window_manager_test.ts | 6 +++--- .../src/test/remote_tool_mock/app_component.ts | 2 +- tools/winscope/src/test/unit/layer_builder.ts | 2 +- tools/winscope/src/test/unit/utils.ts | 8 ++++---- .../trace/flickerlib/Configuration.json | 0 .../trace/flickerlib/ObjectFormatter.ts | 4 ++-- .../src/{common => }/trace/flickerlib/README.md | 0 .../src/{common => }/trace/flickerlib/common.js | 0 .../{common => }/trace/flickerlib/layers/Layer.ts | 0 .../trace/flickerlib/layers/LayerTraceEntry.ts | 4 ++-- .../trace/flickerlib/layers/Transform.ts | 0 .../src/{common => }/trace/flickerlib/mixin.ts | 0 .../trace/flickerlib/windows/Activity.ts | 0 .../trace/flickerlib/windows/DisplayArea.ts | 0 .../trace/flickerlib/windows/DisplayContent.ts | 0 .../{common => }/trace/flickerlib/windows/Task.ts | 0 .../trace/flickerlib/windows/TaskFragment.ts | 0 .../trace/flickerlib/windows/WindowContainer.ts | 0 .../trace/flickerlib/windows/WindowManagerState.ts | 4 ++-- .../trace/flickerlib/windows/WindowState.ts | 0 .../trace/flickerlib/windows/WindowToken.ts | 0 tools/winscope/src/{common => }/trace/protolog.ts | 4 ++-- .../src/{common => }/trace/screen_recording.ts | 0 .../{common => }/trace/screen_recording_utils.ts | 0 tools/winscope/src/{common => }/trace/timestamp.ts | 0 .../src/{common => }/trace/timestamp_test.ts | 0 tools/winscope/src/{common => }/trace/trace.ts | 0 .../src/{common => }/trace/trace_tree_node.ts | 0 .../winscope/src/{common => }/trace/trace_type.ts | 0 .../src/{common => }/trace/transactions.ts | 0 .../winscope/src/trace_collection/proxy_client.ts | 4 ++-- .../src/trace_collection/proxy_connection.ts | 2 +- .../src/trace_collection/trace_collection_utils.ts | 2 +- .../src/trace_collection/tracing_config.ts | 2 +- tools/winscope/src/viewers/common/ime_ui_data.ts | 2 +- tools/winscope/src/viewers/common/ime_utils.ts | 14 +++++++------- .../winscope/src/viewers/common/ime_utils_test.ts | 2 +- .../src/viewers/common/presenter_input_method.ts | 8 ++++---- .../common/presenter_input_method_test_utils.ts | 2 +- .../winscope/src/viewers/common/tree_generator.ts | 6 +++--- .../src/viewers/common/tree_generator_test.ts | 4 ++-- .../src/viewers/common/tree_transformer.ts | 6 +++--- .../src/viewers/common/tree_transformer_test.ts | 4 ++-- .../src/viewers/common/viewer_input_method.ts | 2 +- .../src/viewers/components/hierarchy_component.ts | 4 ++-- .../viewers/components/hierarchy_component_test.ts | 2 +- .../src/viewers/components/properties_component.ts | 2 +- .../components/property_groups_component.ts | 2 +- .../components/transform_matrix_component.ts | 2 +- .../src/viewers/components/tree_component.ts | 4 ++-- .../src/viewers/components/tree_component_test.ts | 2 +- .../components/viewer_input_method_component.ts | 4 ++-- tools/winscope/src/viewers/viewer.ts | 2 +- tools/winscope/src/viewers/viewer_factory.ts | 2 +- .../presenter_input_method_clients_test.ts | 2 +- .../viewer_input_method_clients.ts | 2 +- .../presenter_input_method_manager_service.ts | 2 +- .../presenter_input_method_manager_service_test.ts | 2 +- .../viewer_input_method_manager_service.ts | 2 +- .../presenter_input_method_service_test.ts | 2 +- .../viewer_input_method_service.ts | 2 +- .../src/viewers/viewer_protolog/presenter.ts | 6 +++--- .../src/viewers/viewer_protolog/presenter_test.ts | 4 ++-- .../src/viewers/viewer_protolog/ui_data.ts | 2 +- .../src/viewers/viewer_protolog/viewer_protolog.ts | 2 +- .../viewer_screen_recording.ts | 4 ++-- .../viewer_screen_recording_component.ts | 2 +- .../viewers/viewer_surface_flinger/presenter.ts | 8 ++++---- .../viewer_surface_flinger/presenter_test.ts | 4 ++-- .../src/viewers/viewer_surface_flinger/ui_data.ts | 4 ++-- .../viewer_surface_flinger.ts | 2 +- .../viewer_surface_flinger_component.ts | 4 ++-- .../src/viewers/viewer_transactions/presenter.ts | 12 ++++++------ .../viewers/viewer_transactions/presenter_test.ts | 6 +++--- .../viewer_transactions/viewer_transactions.ts | 2 +- .../src/viewers/viewer_window_manager/presenter.ts | 10 +++++----- .../viewer_window_manager/presenter_test.ts | 4 ++-- .../src/viewers/viewer_window_manager/ui_data.ts | 2 +- .../viewer_window_manager/viewer_window_manager.ts | 2 +- .../viewer_window_manager_component.ts | 4 ++-- 145 files changed, 255 insertions(+), 255 deletions(-) rename tools/winscope/src/common/{utils => }/array_utils.ts (100%) rename tools/winscope/src/common/{utils => }/array_utils_test.ts (100%) rename tools/winscope/src/common/{utils => }/file_utils.ts (100%) rename tools/winscope/src/common/{utils => }/function_utils.ts (100%) rename tools/winscope/src/common/{utils => }/global_config.ts (100%) rename tools/winscope/src/common/{utils => }/persistent_store.ts (100%) rename tools/winscope/src/common/{utils => }/persistent_store_proxy.ts (100%) rename tools/winscope/src/common/{utils => }/persistent_store_proxy_test.ts (100%) rename tools/winscope/src/common/{utils => }/time_utils.ts (99%) rename tools/winscope/src/common/{utils => }/time_utils_test.ts (99%) rename tools/winscope/src/common/{utils => }/tree_utils.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/Configuration.json (100%) rename tools/winscope/src/{common => }/trace/flickerlib/ObjectFormatter.ts (98%) rename tools/winscope/src/{common => }/trace/flickerlib/README.md (100%) rename tools/winscope/src/{common => }/trace/flickerlib/common.js (100%) rename tools/winscope/src/{common => }/trace/flickerlib/layers/Layer.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/layers/LayerTraceEntry.ts (95%) rename tools/winscope/src/{common => }/trace/flickerlib/layers/Transform.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/mixin.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/Activity.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/DisplayArea.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/DisplayContent.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/Task.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/TaskFragment.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/WindowContainer.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/WindowManagerState.ts (97%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/WindowState.ts (100%) rename tools/winscope/src/{common => }/trace/flickerlib/windows/WindowToken.ts (100%) rename tools/winscope/src/{common => }/trace/protolog.ts (97%) rename tools/winscope/src/{common => }/trace/screen_recording.ts (100%) rename tools/winscope/src/{common => }/trace/screen_recording_utils.ts (100%) rename tools/winscope/src/{common => }/trace/timestamp.ts (100%) rename tools/winscope/src/{common => }/trace/timestamp_test.ts (100%) rename tools/winscope/src/{common => }/trace/trace.ts (100%) rename tools/winscope/src/{common => }/trace/trace_tree_node.ts (100%) rename tools/winscope/src/{common => }/trace/trace_type.ts (100%) rename tools/winscope/src/{common => }/trace/transactions.ts (100%) diff --git a/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol.ts b/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol.ts index ece590016..a8aba832f 100644 --- a/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol.ts +++ b/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {FunctionUtils} from 'common/utils/function_utils'; +import {FunctionUtils} from 'common/function_utils'; import { BuganizerAttachmentsDownloadEmitter, OnBuganizerAttachmentsDownloaded, diff --git a/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol_stub.ts b/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol_stub.ts index 795ecc829..c07e9769c 100644 --- a/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol_stub.ts +++ b/tools/winscope/src/abt_chrome_extension/abt_chrome_extension_protocol_stub.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {FunctionUtils} from 'common/utils/function_utils'; +import {FunctionUtils} from 'common/function_utils'; import { BuganizerAttachmentsDownloadEmitter, OnBuganizerAttachmentsDownloaded, diff --git a/tools/winscope/src/app/components/app_component.ts b/tools/winscope/src/app/components/app_component.ts index fcbf1d2e6..314a808be 100644 --- a/tools/winscope/src/app/components/app_component.ts +++ b/tools/winscope/src/app/components/app_component.ts @@ -28,12 +28,12 @@ import {Mediator} from 'app/mediator'; import {TimelineData} from 'app/timeline_data'; import {TraceData} from 'app/trace_data'; import {TRACE_INFO} from 'app/trace_info'; -import {Timestamp} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; -import {FileUtils} from 'common/utils/file_utils'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {FileUtils} from 'common/file_utils'; +import {PersistentStore} from 'common/persistent_store'; import {CrossToolProtocol} from 'cross_tool/cross_tool_protocol'; import {TraceDataListener} from 'interfaces/trace_data_listener'; +import {Timestamp} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {proxyClient, ProxyState} from 'trace_collection/proxy_client'; import {TracingConfig} from 'trace_collection/tracing_config'; import {ViewerInputMethodComponent} from 'viewers/components/viewer_input_method_component'; diff --git a/tools/winscope/src/app/components/collect_traces_component.ts b/tools/winscope/src/app/components/collect_traces_component.ts index 7501c8702..ee3f0ab23 100644 --- a/tools/winscope/src/app/components/collect_traces_component.ts +++ b/tools/winscope/src/app/components/collect_traces_component.ts @@ -28,8 +28,8 @@ import { } from '@angular/core'; import {MatSnackBar} from '@angular/material/snack-bar'; import {TraceData} from 'app/trace_data'; -import {TraceFile} from 'common/trace/trace'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceFile} from 'trace/trace'; import {Connection} from 'trace_collection/connection'; import {ProxyState} from 'trace_collection/proxy_client'; import {ProxyConnection} from 'trace_collection/proxy_connection'; diff --git a/tools/winscope/src/app/components/timeline/expanded_timeline_component.ts b/tools/winscope/src/app/components/timeline/expanded_timeline_component.ts index db62f403d..c0c500032 100644 --- a/tools/winscope/src/app/components/timeline/expanded_timeline_component.ts +++ b/tools/winscope/src/app/components/timeline/expanded_timeline_component.ts @@ -27,7 +27,7 @@ import { } from '@angular/core'; import {TimelineData} from 'app/timeline_data'; import {TRACE_INFO} from 'app/trace_info'; -import {Timestamp} from 'common/trace/timestamp'; +import {Timestamp} from 'trace/timestamp'; import {SingleTimelineComponent} from './single_timeline_component'; @Component({ diff --git a/tools/winscope/src/app/components/timeline/mini_canvas_drawer.ts b/tools/winscope/src/app/components/timeline/mini_canvas_drawer.ts index 5c518a672..5babc4131 100644 --- a/tools/winscope/src/app/components/timeline/mini_canvas_drawer.ts +++ b/tools/winscope/src/app/components/timeline/mini_canvas_drawer.ts @@ -15,7 +15,7 @@ */ import {TRACE_INFO} from 'app/trace_info'; -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {Color} from '../../colors'; import {CanvasDrawer} from '../canvas/canvas_drawer'; import {CanvasMouseHandler} from '../canvas/canvas_mouse_handler'; diff --git a/tools/winscope/src/app/components/timeline/mini_timeline_component.ts b/tools/winscope/src/app/components/timeline/mini_timeline_component.ts index 9642648dc..6ac8e5eb9 100644 --- a/tools/winscope/src/app/components/timeline/mini_timeline_component.ts +++ b/tools/winscope/src/app/components/timeline/mini_timeline_component.ts @@ -25,8 +25,8 @@ import { ViewChild, } from '@angular/core'; import {TimelineData} from 'app/timeline_data'; -import {Timestamp} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; +import {Timestamp} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {MiniCanvasDrawer, MiniCanvasDrawerInput} from './mini_canvas_drawer'; @Component({ diff --git a/tools/winscope/src/app/components/timeline/timeline_component.ts b/tools/winscope/src/app/components/timeline/timeline_component.ts index 16f6f7236..f15538aea 100644 --- a/tools/winscope/src/app/components/timeline/timeline_component.ts +++ b/tools/winscope/src/app/components/timeline/timeline_component.ts @@ -30,10 +30,10 @@ import {FormControl, FormGroup, Validators} from '@angular/forms'; import {DomSanitizer, SafeUrl} from '@angular/platform-browser'; import {TimelineData} from 'app/timeline_data'; import {TRACE_INFO} from 'app/trace_info'; -import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; import {TimestampChangeListener} from 'interfaces/timestamp_change_listener'; +import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {MiniTimelineComponent} from './mini_timeline_component'; @Component({ diff --git a/tools/winscope/src/app/components/timeline/timeline_component_stub.ts b/tools/winscope/src/app/components/timeline/timeline_component_stub.ts index e68e47774..840554237 100644 --- a/tools/winscope/src/app/components/timeline/timeline_component_stub.ts +++ b/tools/winscope/src/app/components/timeline/timeline_component_stub.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {Timestamp} from 'common/trace/timestamp'; import {TimestampChangeListener} from 'interfaces/timestamp_change_listener'; +import {Timestamp} from 'trace/timestamp'; export class TimelineComponentStub implements TimestampChangeListener { onCurrentTimestampChanged(timestamp: Timestamp | undefined) { diff --git a/tools/winscope/src/app/components/timeline/timeline_component_test.ts b/tools/winscope/src/app/components/timeline/timeline_component_test.ts index 9021ca5b8..776619ee3 100644 --- a/tools/winscope/src/app/components/timeline/timeline_component_test.ts +++ b/tools/winscope/src/app/components/timeline/timeline_component_test.ts @@ -30,8 +30,8 @@ import { MatDrawerContent, } from 'app/components/bottomnav/bottom_drawer_component'; import {TimelineData} from 'app/timeline_data'; -import {RealTimestamp, Timestamp} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; +import {RealTimestamp, Timestamp} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {ExpandedTimelineComponent} from './expanded_timeline_component'; import {MiniTimelineComponent} from './mini_timeline_component'; import {SingleTimelineComponent} from './single_timeline_component'; diff --git a/tools/winscope/src/app/components/timeline/utils.ts b/tools/winscope/src/app/components/timeline/utils.ts index 442efaed5..35f564d30 100644 --- a/tools/winscope/src/app/components/timeline/utils.ts +++ b/tools/winscope/src/app/components/timeline/utils.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; export type Segment = {from: number; to: number}; export type BigIntSegment = {from: bigint; to: bigint}; diff --git a/tools/winscope/src/app/components/trace_view_component.ts b/tools/winscope/src/app/components/trace_view_component.ts index 3a8fab6dd..78f243e21 100644 --- a/tools/winscope/src/app/components/trace_view_component.ts +++ b/tools/winscope/src/app/components/trace_view_component.ts @@ -15,7 +15,7 @@ */ import {Component, ElementRef, EventEmitter, Inject, Input, Output} from '@angular/core'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; import {View, Viewer, ViewType} from 'viewers/viewer'; interface Tab extends View { diff --git a/tools/winscope/src/app/components/upload_traces_component.ts b/tools/winscope/src/app/components/upload_traces_component.ts index fe7ff8801..7d59f7e41 100644 --- a/tools/winscope/src/app/components/upload_traces_component.ts +++ b/tools/winscope/src/app/components/upload_traces_component.ts @@ -25,9 +25,9 @@ import { import {MatSnackBar} from '@angular/material/snack-bar'; import {TraceData} from 'app/trace_data'; import {TRACE_INFO} from 'app/trace_info'; -import {Trace, TraceFile} from 'common/trace/trace'; -import {FileUtils, OnFile} from 'common/utils/file_utils'; +import {FileUtils, OnFile} from 'common/file_utils'; import {FilesDownloadListener} from 'interfaces/files_download_listener'; +import {Trace, TraceFile} from 'trace/trace'; import {ParserErrorSnackBarComponent} from './parser_error_snack_bar_component'; @Component({ diff --git a/tools/winscope/src/app/mediator.ts b/tools/winscope/src/app/mediator.ts index 64d720f59..e01422960 100644 --- a/tools/winscope/src/app/mediator.ts +++ b/tools/winscope/src/app/mediator.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {BuganizerAttachmentsDownloadEmitter} from 'interfaces/buganizer_attachments_download_emitter'; import {FilesDownloadListener} from 'interfaces/files_download_listener'; import {RemoteBugreportReceiver} from 'interfaces/remote_bugreport_receiver'; @@ -24,6 +22,8 @@ import {RemoteTimestampSender} from 'interfaces/remote_timestamp_sender'; import {Runnable} from 'interfaces/runnable'; import {TimestampChangeListener} from 'interfaces/timestamp_change_listener'; import {TraceDataListener} from 'interfaces/trace_data_listener'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Viewer} from 'viewers/viewer'; import {ViewerFactory} from 'viewers/viewer_factory'; import {TimelineData} from './timeline_data'; diff --git a/tools/winscope/src/app/mediator_test.ts b/tools/winscope/src/app/mediator_test.ts index cbaf55160..9d0335f81 100644 --- a/tools/winscope/src/app/mediator_test.ts +++ b/tools/winscope/src/app/mediator_test.ts @@ -15,11 +15,11 @@ */ import {AbtChromeExtensionProtocolStub} from 'abt_chrome_extension/abt_chrome_extension_protocol_stub'; -import {RealTimestamp} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; import {CrossToolProtocolStub} from 'cross_tool/cross_tool_protocol_stub'; import {MockStorage} from 'test/unit/mock_storage'; import {UnitTestUtils} from 'test/unit/utils'; +import {RealTimestamp} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; import {ViewerFactory} from 'viewers/viewer_factory'; import {ViewerStub} from 'viewers/viewer_stub'; import {AppComponentStub} from './components/app_component_stub'; diff --git a/tools/winscope/src/app/timeline_data.ts b/tools/winscope/src/app/timeline_data.ts index d33cc176d..3580de9cc 100644 --- a/tools/winscope/src/app/timeline_data.ts +++ b/tools/winscope/src/app/timeline_data.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {ScreenRecordingUtils} from 'common/trace/screen_recording_utils'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; -import {FunctionUtils} from 'common/utils/function_utils'; -import {TimeUtils} from 'common/utils/time_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {FunctionUtils} from 'common/function_utils'; +import {TimeUtils} from 'common/time_utils'; +import {ScreenRecordingUtils} from 'trace/screen_recording_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Timeline} from './trace_data'; export type TimestampCallbackType = (timestamp: Timestamp | undefined) => void; diff --git a/tools/winscope/src/app/timeline_data_test.ts b/tools/winscope/src/app/timeline_data_test.ts index ebd273fe2..9d96ca5ee 100644 --- a/tools/winscope/src/app/timeline_data_test.ts +++ b/tools/winscope/src/app/timeline_data_test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {TimelineData} from './timeline_data'; import {Timeline} from './trace_data'; diff --git a/tools/winscope/src/app/trace_data.ts b/tools/winscope/src/app/trace_data.ts index 5654b598f..23bd6941d 100644 --- a/tools/winscope/src/app/trace_data.ts +++ b/tools/winscope/src/app/trace_data.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {Trace, TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; -import {FunctionUtils, OnProgressUpdateType} from 'common/utils/function_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {FunctionUtils, OnProgressUpdateType} from 'common/function_utils'; import {Parser} from 'parsers/parser'; import {ParserError, ParserFactory} from 'parsers/parser_factory'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {Trace, TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; interface Timeline { traceType: TraceType; diff --git a/tools/winscope/src/app/trace_data_test.ts b/tools/winscope/src/app/trace_data_test.ts index 6e4b67165..cb4a46229 100644 --- a/tools/winscope/src/app/trace_data_test.ts +++ b/tools/winscope/src/app/trace_data_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {TraceData} from './trace_data'; describe('TraceData', () => { diff --git a/tools/winscope/src/app/trace_icons.ts b/tools/winscope/src/app/trace_icons.ts index fb4ceee38..f6ddf4aab 100644 --- a/tools/winscope/src/app/trace_icons.ts +++ b/tools/winscope/src/app/trace_icons.ts @@ -1,4 +1,4 @@ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; const WINDOW_MANAGER_ICON = 'view_compact'; const SURFACE_FLINGER_ICON = 'filter_none'; diff --git a/tools/winscope/src/app/trace_info.ts b/tools/winscope/src/app/trace_info.ts index 946aacd4b..ee467288c 100644 --- a/tools/winscope/src/app/trace_info.ts +++ b/tools/winscope/src/app/trace_info.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; const WINDOW_MANAGER_ICON = 'web'; const SURFACE_FLINGER_ICON = 'layers'; diff --git a/tools/winscope/src/common/utils/array_utils.ts b/tools/winscope/src/common/array_utils.ts similarity index 100% rename from tools/winscope/src/common/utils/array_utils.ts rename to tools/winscope/src/common/array_utils.ts diff --git a/tools/winscope/src/common/utils/array_utils_test.ts b/tools/winscope/src/common/array_utils_test.ts similarity index 100% rename from tools/winscope/src/common/utils/array_utils_test.ts rename to tools/winscope/src/common/array_utils_test.ts diff --git a/tools/winscope/src/common/utils/file_utils.ts b/tools/winscope/src/common/file_utils.ts similarity index 100% rename from tools/winscope/src/common/utils/file_utils.ts rename to tools/winscope/src/common/file_utils.ts diff --git a/tools/winscope/src/common/utils/function_utils.ts b/tools/winscope/src/common/function_utils.ts similarity index 100% rename from tools/winscope/src/common/utils/function_utils.ts rename to tools/winscope/src/common/function_utils.ts diff --git a/tools/winscope/src/common/utils/global_config.ts b/tools/winscope/src/common/global_config.ts similarity index 100% rename from tools/winscope/src/common/utils/global_config.ts rename to tools/winscope/src/common/global_config.ts diff --git a/tools/winscope/src/common/utils/persistent_store.ts b/tools/winscope/src/common/persistent_store.ts similarity index 100% rename from tools/winscope/src/common/utils/persistent_store.ts rename to tools/winscope/src/common/persistent_store.ts diff --git a/tools/winscope/src/common/utils/persistent_store_proxy.ts b/tools/winscope/src/common/persistent_store_proxy.ts similarity index 100% rename from tools/winscope/src/common/utils/persistent_store_proxy.ts rename to tools/winscope/src/common/persistent_store_proxy.ts diff --git a/tools/winscope/src/common/utils/persistent_store_proxy_test.ts b/tools/winscope/src/common/persistent_store_proxy_test.ts similarity index 100% rename from tools/winscope/src/common/utils/persistent_store_proxy_test.ts rename to tools/winscope/src/common/persistent_store_proxy_test.ts diff --git a/tools/winscope/src/common/utils/time_utils.ts b/tools/winscope/src/common/time_utils.ts similarity index 99% rename from tools/winscope/src/common/utils/time_utils.ts rename to tools/winscope/src/common/time_utils.ts index 0469d349b..ee000504a 100644 --- a/tools/winscope/src/common/utils/time_utils.ts +++ b/tools/winscope/src/common/time_utils.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'common/trace/timestamp'; +import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'trace/timestamp'; export class TimeUtils { static compareFn(a: Timestamp, b: Timestamp): number { diff --git a/tools/winscope/src/common/utils/time_utils_test.ts b/tools/winscope/src/common/time_utils_test.ts similarity index 99% rename from tools/winscope/src/common/utils/time_utils_test.ts rename to tools/winscope/src/common/time_utils_test.ts index c2a800444..b3c24b3a8 100644 --- a/tools/winscope/src/common/utils/time_utils_test.ts +++ b/tools/winscope/src/common/time_utils_test.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'common/trace/timestamp'; +import {ElapsedTimestamp, RealTimestamp, Timestamp, TimestampType} from 'trace/timestamp'; import {TimeUtils} from './time_utils'; describe('TimeUtils', () => { diff --git a/tools/winscope/src/common/utils/tree_utils.ts b/tools/winscope/src/common/tree_utils.ts similarity index 100% rename from tools/winscope/src/common/utils/tree_utils.ts rename to tools/winscope/src/common/tree_utils.ts diff --git a/tools/winscope/src/cross_tool/cross_tool_protocol.ts b/tools/winscope/src/cross_tool/cross_tool_protocol.ts index b59244bf9..84554f197 100644 --- a/tools/winscope/src/cross_tool/cross_tool_protocol.ts +++ b/tools/winscope/src/cross_tool/cross_tool_protocol.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {RealTimestamp} from 'common/trace/timestamp'; -import {FunctionUtils} from 'common/utils/function_utils'; +import {FunctionUtils} from 'common/function_utils'; import {OnBugreportReceived, RemoteBugreportReceiver} from 'interfaces/remote_bugreport_receiver'; import {OnTimestampReceived, RemoteTimestampReceiver} from 'interfaces/remote_timestamp_receiver'; import {RemoteTimestampSender} from 'interfaces/remote_timestamp_sender'; +import {RealTimestamp} from 'trace/timestamp'; import {Message, MessageBugReport, MessagePong, MessageTimestamp, MessageType} from './messages'; import {OriginAllowList} from './origin_allow_list'; diff --git a/tools/winscope/src/cross_tool/cross_tool_protocol_stub.ts b/tools/winscope/src/cross_tool/cross_tool_protocol_stub.ts index 2f195d352..a1adab7b8 100644 --- a/tools/winscope/src/cross_tool/cross_tool_protocol_stub.ts +++ b/tools/winscope/src/cross_tool/cross_tool_protocol_stub.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {RealTimestamp} from 'common/trace/timestamp'; -import {FunctionUtils} from 'common/utils/function_utils'; +import {FunctionUtils} from 'common/function_utils'; import {OnBugreportReceived, RemoteBugreportReceiver} from 'interfaces/remote_bugreport_receiver'; import {OnTimestampReceived, RemoteTimestampReceiver} from 'interfaces/remote_timestamp_receiver'; import {RemoteTimestampSender} from 'interfaces/remote_timestamp_sender'; +import {RealTimestamp} from 'trace/timestamp'; export class CrossToolProtocolStub implements RemoteBugreportReceiver, RemoteTimestampReceiver, RemoteTimestampSender diff --git a/tools/winscope/src/cross_tool/origin_allow_list.ts b/tools/winscope/src/cross_tool/origin_allow_list.ts index ad80ec860..55199c4ed 100644 --- a/tools/winscope/src/cross_tool/origin_allow_list.ts +++ b/tools/winscope/src/cross_tool/origin_allow_list.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {globalConfig} from 'common/utils/global_config'; +import {globalConfig} from 'common/global_config'; export class OriginAllowList { private static readonly ALLOW_LIST_PROD = [ diff --git a/tools/winscope/src/interfaces/remote_bugreport_receiver.ts b/tools/winscope/src/interfaces/remote_bugreport_receiver.ts index 9b0d546f1..992eef728 100644 --- a/tools/winscope/src/interfaces/remote_bugreport_receiver.ts +++ b/tools/winscope/src/interfaces/remote_bugreport_receiver.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {RealTimestamp} from 'common/trace/timestamp'; +import {RealTimestamp} from 'trace/timestamp'; export type OnBugreportReceived = (bugreport: File, timestamp?: RealTimestamp) => Promise; diff --git a/tools/winscope/src/interfaces/remote_timestamp_receiver.ts b/tools/winscope/src/interfaces/remote_timestamp_receiver.ts index 304052b0d..e25b4709c 100644 --- a/tools/winscope/src/interfaces/remote_timestamp_receiver.ts +++ b/tools/winscope/src/interfaces/remote_timestamp_receiver.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {RealTimestamp} from 'common/trace/timestamp'; +import {RealTimestamp} from 'trace/timestamp'; export type OnTimestampReceived = (timestamp: RealTimestamp) => void; diff --git a/tools/winscope/src/interfaces/remote_timestamp_sender.ts b/tools/winscope/src/interfaces/remote_timestamp_sender.ts index 35042bd1c..03ab55335 100644 --- a/tools/winscope/src/interfaces/remote_timestamp_sender.ts +++ b/tools/winscope/src/interfaces/remote_timestamp_sender.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {RealTimestamp} from 'common/trace/timestamp'; +import {RealTimestamp} from 'trace/timestamp'; export interface RemoteTimestampSender { sendTimestamp(timestamp: RealTimestamp): void; diff --git a/tools/winscope/src/interfaces/timestamp_change_listener.ts b/tools/winscope/src/interfaces/timestamp_change_listener.ts index cb0195540..154a1befe 100644 --- a/tools/winscope/src/interfaces/timestamp_change_listener.ts +++ b/tools/winscope/src/interfaces/timestamp_change_listener.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {Timestamp} from 'common/trace/timestamp'; +import {Timestamp} from 'trace/timestamp'; export interface TimestampChangeListener { onCurrentTimestampChanged(timestamp: Timestamp | undefined): void; diff --git a/tools/winscope/src/main_dev.ts b/tools/winscope/src/main_dev.ts index d930095fb..1e69894ef 100644 --- a/tools/winscope/src/main_dev.ts +++ b/tools/winscope/src/main_dev.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {globalConfig} from 'common/utils/global_config'; +import {globalConfig} from 'common/global_config'; import {AppModule} from './app/app_module'; globalConfig.set({ diff --git a/tools/winscope/src/parsers/parser.ts b/tools/winscope/src/parsers/parser.ts index d597e33c9..197d20a57 100644 --- a/tools/winscope/src/parsers/parser.ts +++ b/tools/winscope/src/parsers/parser.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {Trace, TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {Trace, TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; abstract class Parser { protected trace: TraceFile; diff --git a/tools/winscope/src/parsers/parser_accessibility.ts b/tools/winscope/src/parsers/parser_accessibility.ts index b4cd41416..9d4737f1d 100644 --- a/tools/winscope/src/parsers/parser_accessibility.ts +++ b/tools/winscope/src/parsers/parser_accessibility.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {AccessibilityTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_accessibility_test.ts b/tools/winscope/src/parsers/parser_accessibility_test.ts index 4b5f651b5..e31a7fd92 100644 --- a/tools/winscope/src/parsers/parser_accessibility_test.ts +++ b/tools/winscope/src/parsers/parser_accessibility_test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserAccessibility', () => { diff --git a/tools/winscope/src/parsers/parser_common_test.ts b/tools/winscope/src/parsers/parser_common_test.ts index 5282315f0..2babbfc16 100644 --- a/tools/winscope/src/parsers/parser_common_test.ts +++ b/tools/winscope/src/parsers/parser_common_test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; import {CommonTestUtils} from 'test/common/utils'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {ParserFactory} from './parser_factory'; diff --git a/tools/winscope/src/parsers/parser_factory.ts b/tools/winscope/src/parsers/parser_factory.ts index 0140770a1..48fa7fd54 100644 --- a/tools/winscope/src/parsers/parser_factory.ts +++ b/tools/winscope/src/parsers/parser_factory.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {FunctionUtils, OnProgressUpdateType} from 'common/utils/function_utils'; +import {FunctionUtils, OnProgressUpdateType} from 'common/function_utils'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {ParserAccessibility} from './parser_accessibility'; import {ParserInputMethodClients} from './parser_input_method_clients'; diff --git a/tools/winscope/src/parsers/parser_input_method_clients.ts b/tools/winscope/src/parsers/parser_input_method_clients.ts index 7f0ee1dce..9cb5e61a1 100644 --- a/tools/winscope/src/parsers/parser_input_method_clients.ts +++ b/tools/winscope/src/parsers/parser_input_method_clients.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TraceType} from 'common/trace/trace_type'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceTreeNode} from 'trace/trace_tree_node'; +import {TraceType} from 'trace/trace_type'; import {ImeUtils} from 'viewers/common/ime_utils'; import {Parser} from './parser'; import {InputMethodClientsTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_input_method_clients_test.ts b/tools/winscope/src/parsers/parser_input_method_clients_test.ts index 955fffe63..6f499c054 100644 --- a/tools/winscope/src/parsers/parser_input_method_clients_test.ts +++ b/tools/winscope/src/parsers/parser_input_method_clients_test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserInputMethodlClients', () => { diff --git a/tools/winscope/src/parsers/parser_input_method_manager_service.ts b/tools/winscope/src/parsers/parser_input_method_manager_service.ts index fe0eb50a7..4a11b39bb 100644 --- a/tools/winscope/src/parsers/parser_input_method_manager_service.ts +++ b/tools/winscope/src/parsers/parser_input_method_manager_service.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TraceType} from 'common/trace/trace_type'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceTreeNode} from 'trace/trace_tree_node'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {InputMethodManagerServiceTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_input_method_manager_service_test.ts b/tools/winscope/src/parsers/parser_input_method_manager_service_test.ts index 753660bfd..1b6206f7c 100644 --- a/tools/winscope/src/parsers/parser_input_method_manager_service_test.ts +++ b/tools/winscope/src/parsers/parser_input_method_manager_service_test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserInputMethodManagerService', () => { diff --git a/tools/winscope/src/parsers/parser_input_method_service.ts b/tools/winscope/src/parsers/parser_input_method_service.ts index 57cbda59f..1509e987d 100644 --- a/tools/winscope/src/parsers/parser_input_method_service.ts +++ b/tools/winscope/src/parsers/parser_input_method_service.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TraceType} from 'common/trace/trace_type'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceTreeNode} from 'trace/trace_tree_node'; +import {TraceType} from 'trace/trace_type'; import {ImeUtils} from 'viewers/common/ime_utils'; import {Parser} from './parser'; import {InputMethodServiceTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_input_method_service_test.ts b/tools/winscope/src/parsers/parser_input_method_service_test.ts index 44cf2bfe6..89ff01b03 100644 --- a/tools/winscope/src/parsers/parser_input_method_service_test.ts +++ b/tools/winscope/src/parsers/parser_input_method_service_test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserInputMethodService', () => { diff --git a/tools/winscope/src/parsers/parser_protolog.ts b/tools/winscope/src/parsers/parser_protolog.ts index 17f006681..375187518 100644 --- a/tools/winscope/src/parsers/parser_protolog.ts +++ b/tools/winscope/src/parsers/parser_protolog.ts @@ -19,10 +19,10 @@ import { LogMessage, ProtoLogTraceEntry, UnformattedLogMessage, -} from 'common/trace/protolog'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; +} from 'trace/protolog'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import configJson from '../../../../../frameworks/base/data/etc/services.core.protolog.json'; import {Parser} from './parser'; import {ProtoLogFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_protolog_test.ts b/tools/winscope/src/parsers/parser_protolog_test.ts index 4e9d88e96..e9d7fccce 100644 --- a/tools/winscope/src/parsers/parser_protolog_test.ts +++ b/tools/winscope/src/parsers/parser_protolog_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; -import {LogMessage} from '../common/trace/protolog'; +import {LogMessage} from 'trace/protolog'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserProtoLog', () => { diff --git a/tools/winscope/src/parsers/parser_screen_recording.ts b/tools/winscope/src/parsers/parser_screen_recording.ts index 90017d963..6142f342c 100644 --- a/tools/winscope/src/parsers/parser_screen_recording.ts +++ b/tools/winscope/src/parsers/parser_screen_recording.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {ScreenRecordingUtils} from 'common/trace/screen_recording_utils'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {ScreenRecordingUtils} from 'trace/screen_recording_utils'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; class ScreenRecordingMetadataEntry { diff --git a/tools/winscope/src/parsers/parser_screen_recording_legacy.ts b/tools/winscope/src/parsers/parser_screen_recording_legacy.ts index a53028da0..0b6a33779 100644 --- a/tools/winscope/src/parsers/parser_screen_recording_legacy.ts +++ b/tools/winscope/src/parsers/parser_screen_recording_legacy.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; class ParserScreenRecordingLegacy extends Parser { diff --git a/tools/winscope/src/parsers/parser_screen_recording_legacy_test.ts b/tools/winscope/src/parsers/parser_screen_recording_legacy_test.ts index 3c4aef753..8e593e621 100644 --- a/tools/winscope/src/parsers/parser_screen_recording_legacy_test.ts +++ b/tools/winscope/src/parsers/parser_screen_recording_legacy_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserScreenRecordingLegacy', () => { diff --git a/tools/winscope/src/parsers/parser_screen_recording_test.ts b/tools/winscope/src/parsers/parser_screen_recording_test.ts index 6ffa460ea..86045dabb 100644 --- a/tools/winscope/src/parsers/parser_screen_recording_test.ts +++ b/tools/winscope/src/parsers/parser_screen_recording_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserScreenRecording', () => { diff --git a/tools/winscope/src/parsers/parser_surface_flinger.ts b/tools/winscope/src/parsers/parser_surface_flinger.ts index 5147c9add..6435090ec 100644 --- a/tools/winscope/src/parsers/parser_surface_flinger.ts +++ b/tools/winscope/src/parsers/parser_surface_flinger.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import {LayerTraceEntry} from 'common/trace/flickerlib/layers/LayerTraceEntry'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; +import {LayerTraceEntry} from 'trace/flickerlib/layers/LayerTraceEntry'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {LayersTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_surface_flinger_dump_test.ts b/tools/winscope/src/parsers/parser_surface_flinger_dump_test.ts index afba3b814..caf517835 100644 --- a/tools/winscope/src/parsers/parser_surface_flinger_dump_test.ts +++ b/tools/winscope/src/parsers/parser_surface_flinger_dump_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LayerTraceEntry} from 'common/trace/flickerlib/layers/LayerTraceEntry'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {LayerTraceEntry} from 'trace/flickerlib/layers/LayerTraceEntry'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserSurfaceFlingerDump', () => { diff --git a/tools/winscope/src/parsers/parser_surface_flinger_test.ts b/tools/winscope/src/parsers/parser_surface_flinger_test.ts index 163048d2e..b4c8c121d 100644 --- a/tools/winscope/src/parsers/parser_surface_flinger_test.ts +++ b/tools/winscope/src/parsers/parser_surface_flinger_test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Layer} from 'common/trace/flickerlib/layers/Layer'; -import {LayerTraceEntry} from 'common/trace/flickerlib/layers/LayerTraceEntry'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {Layer} from 'trace/flickerlib/layers/Layer'; +import {LayerTraceEntry} from 'trace/flickerlib/layers/LayerTraceEntry'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserSurfaceFlinger', () => { diff --git a/tools/winscope/src/parsers/parser_transactions.ts b/tools/winscope/src/parsers/parser_transactions.ts index 155517c4c..9471838f3 100644 --- a/tools/winscope/src/parsers/parser_transactions.ts +++ b/tools/winscope/src/parsers/parser_transactions.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; -import {TransactionsTraceEntry} from 'common/trace/transactions'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; +import {TransactionsTraceEntry} from 'trace/transactions'; import {Parser} from './parser'; import {TransactionsTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_transactions_test.ts b/tools/winscope/src/parsers/parser_transactions_test.ts index 6363aeafd..32f718953 100644 --- a/tools/winscope/src/parsers/parser_transactions_test.ts +++ b/tools/winscope/src/parsers/parser_transactions_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; -import {TransactionsTraceEntry} from '../common/trace/transactions'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; +import {TransactionsTraceEntry} from 'trace/transactions'; import {Parser} from './parser'; describe('ParserTransactions', () => { diff --git a/tools/winscope/src/parsers/parser_window_manager.ts b/tools/winscope/src/parsers/parser_window_manager.ts index 09914ea85..018234d9e 100644 --- a/tools/winscope/src/parsers/parser_window_manager.ts +++ b/tools/winscope/src/parsers/parser_window_manager.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {WindowManagerState} from 'common/trace/flickerlib/windows/WindowManagerState'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; +import {WindowManagerState} from 'trace/flickerlib/windows/WindowManagerState'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {WindowManagerTraceFileProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_window_manager_dump.ts b/tools/winscope/src/parsers/parser_window_manager_dump.ts index cee00a9f4..7c388a28b 100644 --- a/tools/winscope/src/parsers/parser_window_manager_dump.ts +++ b/tools/winscope/src/parsers/parser_window_manager_dump.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import {WindowManagerState} from 'common/trace/flickerlib/windows/WindowManagerState'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; +import {WindowManagerState} from 'trace/flickerlib/windows/WindowManagerState'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; import {WindowManagerServiceDumpProto} from './proto_types'; diff --git a/tools/winscope/src/parsers/parser_window_manager_dump_test.ts b/tools/winscope/src/parsers/parser_window_manager_dump_test.ts index 5afe279a8..16da855c2 100644 --- a/tools/winscope/src/parsers/parser_window_manager_dump_test.ts +++ b/tools/winscope/src/parsers/parser_window_manager_dump_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {WindowManagerState} from 'common/trace/flickerlib/windows/WindowManagerState'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {WindowManagerState} from 'trace/flickerlib/windows/WindowManagerState'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserWindowManagerDump', () => { diff --git a/tools/winscope/src/parsers/parser_window_manager_test.ts b/tools/winscope/src/parsers/parser_window_manager_test.ts index cf43b615e..07bf07209 100644 --- a/tools/winscope/src/parsers/parser_window_manager_test.ts +++ b/tools/winscope/src/parsers/parser_window_manager_test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {WindowManagerState} from 'common/trace/flickerlib/windows/WindowManagerState'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {WindowManagerState} from 'trace/flickerlib/windows/WindowManagerState'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; import {Parser} from './parser'; describe('ParserWindowManager', () => { diff --git a/tools/winscope/src/test/remote_tool_mock/app_component.ts b/tools/winscope/src/test/remote_tool_mock/app_component.ts index 9752e5367..bb3a1ce49 100644 --- a/tools/winscope/src/test/remote_tool_mock/app_component.ts +++ b/tools/winscope/src/test/remote_tool_mock/app_component.ts @@ -15,7 +15,7 @@ */ import {ChangeDetectorRef, Component, Inject} from '@angular/core'; -import {FunctionUtils} from 'common/utils/function_utils'; +import {FunctionUtils} from 'common/function_utils'; import { Message, MessageBugReport, diff --git a/tools/winscope/src/test/unit/layer_builder.ts b/tools/winscope/src/test/unit/layer_builder.ts index 8d6dfca5c..540a66ee5 100644 --- a/tools/winscope/src/test/unit/layer_builder.ts +++ b/tools/winscope/src/test/unit/layer_builder.ts @@ -22,7 +22,7 @@ import { EMPTY_TRANSFORM, Layer, LayerProperties, -} from 'common/trace/flickerlib/common'; +} from 'trace/flickerlib/common'; class LayerBuilder { setFlags(value: number): LayerBuilder { diff --git a/tools/winscope/src/test/unit/utils.ts b/tools/winscope/src/test/unit/utils.ts index 011cdf85a..84d476fdd 100644 --- a/tools/winscope/src/test/unit/utils.ts +++ b/tools/winscope/src/test/unit/utils.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import {LayerTraceEntry, WindowManagerState} from 'common/trace/flickerlib/common'; -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceFile} from 'common/trace/trace'; -import {TraceType} from 'common/trace/trace_type'; import {Parser} from 'parsers/parser'; import {ParserFactory} from 'parsers/parser_factory'; import {CommonTestUtils} from 'test/common/utils'; +import {LayerTraceEntry, WindowManagerState} from 'trace/flickerlib/common'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceFile} from 'trace/trace'; +import {TraceType} from 'trace/trace_type'; class UnitTestUtils extends CommonTestUtils { static async getParser(filename: string): Promise { diff --git a/tools/winscope/src/common/trace/flickerlib/Configuration.json b/tools/winscope/src/trace/flickerlib/Configuration.json similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/Configuration.json rename to tools/winscope/src/trace/flickerlib/Configuration.json diff --git a/tools/winscope/src/common/trace/flickerlib/ObjectFormatter.ts b/tools/winscope/src/trace/flickerlib/ObjectFormatter.ts similarity index 98% rename from tools/winscope/src/common/trace/flickerlib/ObjectFormatter.ts rename to tools/winscope/src/trace/flickerlib/ObjectFormatter.ts index 53b558fcc..c1af0b626 100644 --- a/tools/winscope/src/common/trace/flickerlib/ObjectFormatter.ts +++ b/tools/winscope/src/trace/flickerlib/ObjectFormatter.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {ArrayUtils} from 'common/utils/array_utils'; +import {ArrayUtils} from 'common/array_utils'; import {PropertiesDump} from 'viewers/common/ui_tree_utils'; -import intDefMapping from '../../../../../../../prebuilts/misc/common/winscope/intDefMapping.json'; +import intDefMapping from '../../../../../../prebuilts/misc/common/winscope/intDefMapping.json'; import { toActiveBuffer, toColor, diff --git a/tools/winscope/src/common/trace/flickerlib/README.md b/tools/winscope/src/trace/flickerlib/README.md similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/README.md rename to tools/winscope/src/trace/flickerlib/README.md diff --git a/tools/winscope/src/common/trace/flickerlib/common.js b/tools/winscope/src/trace/flickerlib/common.js similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/common.js rename to tools/winscope/src/trace/flickerlib/common.js diff --git a/tools/winscope/src/common/trace/flickerlib/layers/Layer.ts b/tools/winscope/src/trace/flickerlib/layers/Layer.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/layers/Layer.ts rename to tools/winscope/src/trace/flickerlib/layers/Layer.ts diff --git a/tools/winscope/src/common/trace/flickerlib/layers/LayerTraceEntry.ts b/tools/winscope/src/trace/flickerlib/layers/LayerTraceEntry.ts similarity index 95% rename from tools/winscope/src/common/trace/flickerlib/layers/LayerTraceEntry.ts rename to tools/winscope/src/trace/flickerlib/layers/LayerTraceEntry.ts index 165bb50df..84f1534e3 100644 --- a/tools/winscope/src/common/trace/flickerlib/layers/LayerTraceEntry.ts +++ b/tools/winscope/src/trace/flickerlib/layers/LayerTraceEntry.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {ElapsedTimestamp, RealTimestamp} from 'common/trace/timestamp'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; +import {ElapsedTimestamp, RealTimestamp} from 'trace/timestamp'; import { Display, LayerTraceEntry, diff --git a/tools/winscope/src/common/trace/flickerlib/layers/Transform.ts b/tools/winscope/src/trace/flickerlib/layers/Transform.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/layers/Transform.ts rename to tools/winscope/src/trace/flickerlib/layers/Transform.ts diff --git a/tools/winscope/src/common/trace/flickerlib/mixin.ts b/tools/winscope/src/trace/flickerlib/mixin.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/mixin.ts rename to tools/winscope/src/trace/flickerlib/mixin.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/Activity.ts b/tools/winscope/src/trace/flickerlib/windows/Activity.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/Activity.ts rename to tools/winscope/src/trace/flickerlib/windows/Activity.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/DisplayArea.ts b/tools/winscope/src/trace/flickerlib/windows/DisplayArea.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/DisplayArea.ts rename to tools/winscope/src/trace/flickerlib/windows/DisplayArea.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/DisplayContent.ts b/tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/DisplayContent.ts rename to tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/Task.ts b/tools/winscope/src/trace/flickerlib/windows/Task.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/Task.ts rename to tools/winscope/src/trace/flickerlib/windows/Task.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/TaskFragment.ts b/tools/winscope/src/trace/flickerlib/windows/TaskFragment.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/TaskFragment.ts rename to tools/winscope/src/trace/flickerlib/windows/TaskFragment.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/WindowContainer.ts b/tools/winscope/src/trace/flickerlib/windows/WindowContainer.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/WindowContainer.ts rename to tools/winscope/src/trace/flickerlib/windows/WindowContainer.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/WindowManagerState.ts b/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts similarity index 97% rename from tools/winscope/src/common/trace/flickerlib/windows/WindowManagerState.ts rename to tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts index 1fffac8be..a07206c7b 100644 --- a/tools/winscope/src/common/trace/flickerlib/windows/WindowManagerState.ts +++ b/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {ElapsedTimestamp, RealTimestamp} from 'common/trace/timestamp'; -import {TimeUtils} from 'common/utils/time_utils'; +import {TimeUtils} from 'common/time_utils'; +import {ElapsedTimestamp, RealTimestamp} from 'trace/timestamp'; import { KeyguardControllerState, PlatformConsts, diff --git a/tools/winscope/src/common/trace/flickerlib/windows/WindowState.ts b/tools/winscope/src/trace/flickerlib/windows/WindowState.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/WindowState.ts rename to tools/winscope/src/trace/flickerlib/windows/WindowState.ts diff --git a/tools/winscope/src/common/trace/flickerlib/windows/WindowToken.ts b/tools/winscope/src/trace/flickerlib/windows/WindowToken.ts similarity index 100% rename from tools/winscope/src/common/trace/flickerlib/windows/WindowToken.ts rename to tools/winscope/src/trace/flickerlib/windows/WindowToken.ts diff --git a/tools/winscope/src/common/trace/protolog.ts b/tools/winscope/src/trace/protolog.ts similarity index 97% rename from tools/winscope/src/common/trace/protolog.ts rename to tools/winscope/src/trace/protolog.ts index 3b916d1da..f3e71ab86 100644 --- a/tools/winscope/src/common/trace/protolog.ts +++ b/tools/winscope/src/trace/protolog.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TimeUtils} from 'common/utils/time_utils'; -import configJson from '../../../../../../frameworks/base/data/etc/services.core.protolog.json'; +import {TimeUtils} from 'common/time_utils'; +import configJson from '../../../../../frameworks/base/data/etc/services.core.protolog.json'; import {ElapsedTimestamp, RealTimestamp, TimestampType} from './timestamp'; class ProtoLogTraceEntry { diff --git a/tools/winscope/src/common/trace/screen_recording.ts b/tools/winscope/src/trace/screen_recording.ts similarity index 100% rename from tools/winscope/src/common/trace/screen_recording.ts rename to tools/winscope/src/trace/screen_recording.ts diff --git a/tools/winscope/src/common/trace/screen_recording_utils.ts b/tools/winscope/src/trace/screen_recording_utils.ts similarity index 100% rename from tools/winscope/src/common/trace/screen_recording_utils.ts rename to tools/winscope/src/trace/screen_recording_utils.ts diff --git a/tools/winscope/src/common/trace/timestamp.ts b/tools/winscope/src/trace/timestamp.ts similarity index 100% rename from tools/winscope/src/common/trace/timestamp.ts rename to tools/winscope/src/trace/timestamp.ts diff --git a/tools/winscope/src/common/trace/timestamp_test.ts b/tools/winscope/src/trace/timestamp_test.ts similarity index 100% rename from tools/winscope/src/common/trace/timestamp_test.ts rename to tools/winscope/src/trace/timestamp_test.ts diff --git a/tools/winscope/src/common/trace/trace.ts b/tools/winscope/src/trace/trace.ts similarity index 100% rename from tools/winscope/src/common/trace/trace.ts rename to tools/winscope/src/trace/trace.ts diff --git a/tools/winscope/src/common/trace/trace_tree_node.ts b/tools/winscope/src/trace/trace_tree_node.ts similarity index 100% rename from tools/winscope/src/common/trace/trace_tree_node.ts rename to tools/winscope/src/trace/trace_tree_node.ts diff --git a/tools/winscope/src/common/trace/trace_type.ts b/tools/winscope/src/trace/trace_type.ts similarity index 100% rename from tools/winscope/src/common/trace/trace_type.ts rename to tools/winscope/src/trace/trace_type.ts diff --git a/tools/winscope/src/common/trace/transactions.ts b/tools/winscope/src/trace/transactions.ts similarity index 100% rename from tools/winscope/src/common/trace/transactions.ts rename to tools/winscope/src/trace/transactions.ts diff --git a/tools/winscope/src/trace_collection/proxy_client.ts b/tools/winscope/src/trace_collection/proxy_client.ts index f1b30a745..a3668690c 100644 --- a/tools/winscope/src/trace_collection/proxy_client.ts +++ b/tools/winscope/src/trace_collection/proxy_client.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {OnProgressUpdateType} from 'common/utils/function_utils'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {OnProgressUpdateType} from 'common/function_utils'; +import {PersistentStore} from 'common/persistent_store'; import {Device} from './connection'; import {configMap} from './trace_collection_utils'; diff --git a/tools/winscope/src/trace_collection/proxy_connection.ts b/tools/winscope/src/trace_collection/proxy_connection.ts index c7067ef74..01b1eee36 100644 --- a/tools/winscope/src/trace_collection/proxy_connection.ts +++ b/tools/winscope/src/trace_collection/proxy_connection.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {FunctionUtils, OnProgressUpdateType} from 'common/utils/function_utils'; +import {FunctionUtils, OnProgressUpdateType} from 'common/function_utils'; import {proxyClient, ProxyEndpoint, proxyRequest, ProxyState} from 'trace_collection/proxy_client'; import {Connection, DeviceProperties} from './connection'; import {configMap} from './trace_collection_utils'; diff --git a/tools/winscope/src/trace_collection/trace_collection_utils.ts b/tools/winscope/src/trace_collection/trace_collection_utils.ts index c74f61ffd..aebc3c28c 100644 --- a/tools/winscope/src/trace_collection/trace_collection_utils.ts +++ b/tools/winscope/src/trace_collection/trace_collection_utils.ts @@ -1,4 +1,4 @@ -import {StoreObject} from 'common/utils/persistent_store_proxy'; +import {StoreObject} from 'common/persistent_store_proxy'; export type TraceConfiguration = { [key: string]: string | boolean | undefined | StoreObject; diff --git a/tools/winscope/src/trace_collection/tracing_config.ts b/tools/winscope/src/trace_collection/tracing_config.ts index 4b812d592..940de317a 100644 --- a/tools/winscope/src/trace_collection/tracing_config.ts +++ b/tools/winscope/src/trace_collection/tracing_config.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {PersistentStoreProxy} from 'common/utils/persistent_store_proxy'; +import {PersistentStoreProxy} from 'common/persistent_store_proxy'; import {TraceConfigurationMap, TRACES} from './trace_collection_utils'; export class TracingConfig { diff --git a/tools/winscope/src/viewers/common/ime_ui_data.ts b/tools/winscope/src/viewers/common/ime_ui_data.ts index bc1d88278..f5e06950b 100644 --- a/tools/winscope/src/viewers/common/ime_ui_data.ts +++ b/tools/winscope/src/viewers/common/ime_ui_data.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ImeAdditionalProperties} from 'viewers/common/ime_additional_properties'; import {TableProperties} from 'viewers/common/table_properties'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; diff --git a/tools/winscope/src/viewers/common/ime_utils.ts b/tools/winscope/src/viewers/common/ime_utils.ts index 30ccf1e04..db152f73c 100644 --- a/tools/winscope/src/viewers/common/ime_utils.ts +++ b/tools/winscope/src/viewers/common/ime_utils.ts @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {WindowContainer} from 'common/trace/flickerlib/common'; -import {Layer} from 'common/trace/flickerlib/layers/Layer'; -import {LayerTraceEntry} from 'common/trace/flickerlib/layers/LayerTraceEntry'; -import Activity from 'common/trace/flickerlib/windows/Activity'; -import {WindowManagerState} from 'common/trace/flickerlib/windows/WindowManagerState'; -import WindowState from 'common/trace/flickerlib/windows/WindowState'; -import {FilterType, TreeUtils} from 'common/utils/tree_utils'; +import {FilterType, TreeUtils} from 'common/tree_utils'; +import {WindowContainer} from 'trace/flickerlib/common'; +import {Layer} from 'trace/flickerlib/layers/Layer'; +import {LayerTraceEntry} from 'trace/flickerlib/layers/LayerTraceEntry'; +import Activity from 'trace/flickerlib/windows/Activity'; +import {WindowManagerState} from 'trace/flickerlib/windows/WindowManagerState'; +import WindowState from 'trace/flickerlib/windows/WindowState'; class ProcessedWindowManagerState { constructor( diff --git a/tools/winscope/src/viewers/common/ime_utils_test.ts b/tools/winscope/src/viewers/common/ime_utils_test.ts index 5178e49b5..478363616 100644 --- a/tools/winscope/src/viewers/common/ime_utils_test.ts +++ b/tools/winscope/src/viewers/common/ime_utils_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; import {UnitTestUtils} from 'test/unit/utils'; +import {TraceType} from 'trace/trace_type'; import {ImeUtils} from './ime_utils'; describe('ImeUtils', () => { diff --git a/tools/winscope/src/viewers/common/presenter_input_method.ts b/tools/winscope/src/viewers/common/presenter_input_method.ts index d57e2dbeb..8dfad5d13 100644 --- a/tools/winscope/src/viewers/common/presenter_input_method.ts +++ b/tools/winscope/src/viewers/common/presenter_input_method.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStoreProxy} from 'common/utils/persistent_store_proxy'; -import {FilterType, TreeUtils} from 'common/utils/tree_utils'; +import {PersistentStoreProxy} from 'common/persistent_store_proxy'; +import {FilterType, TreeUtils} from 'common/tree_utils'; +import {TraceTreeNode} from 'trace/trace_tree_node'; +import {TraceType} from 'trace/trace_type'; import {ImeAdditionalProperties} from 'viewers/common/ime_additional_properties'; import {ImeUiData} from 'viewers/common/ime_ui_data'; import {ImeLayers, ImeUtils, ProcessedWindowManagerState} from 'viewers/common/ime_utils'; diff --git a/tools/winscope/src/viewers/common/presenter_input_method_test_utils.ts b/tools/winscope/src/viewers/common/presenter_input_method_test_utils.ts index 76d83964d..739b84310 100644 --- a/tools/winscope/src/viewers/common/presenter_input_method_test_utils.ts +++ b/tools/winscope/src/viewers/common/presenter_input_method_test_utils.ts @@ -14,10 +14,10 @@ * limitations under the License.d */ -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; import {MockStorage} from 'test/unit/mock_storage'; import {UnitTestUtils} from 'test/unit/utils'; +import {TraceType} from 'trace/trace_type'; import {ImeUiData} from 'viewers/common/ime_ui_data'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; diff --git a/tools/winscope/src/viewers/common/tree_generator.ts b/tools/winscope/src/viewers/common/tree_generator.ts index f3f3009ff..3ed6291f5 100644 --- a/tools/winscope/src/viewers/common/tree_generator.ts +++ b/tools/winscope/src/viewers/common/tree_generator.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import ObjectFormatter from 'common/trace/flickerlib/ObjectFormatter'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {FilterType, TreeNode} from 'common/utils/tree_utils'; +import {FilterType, TreeNode} from 'common/tree_utils'; +import ObjectFormatter from 'trace/flickerlib/ObjectFormatter'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import { GPU_CHIP, HWC_CHIP, diff --git a/tools/winscope/src/viewers/common/tree_generator_test.ts b/tools/winscope/src/viewers/common/tree_generator_test.ts index f8fc7d5f3..91b870c03 100644 --- a/tools/winscope/src/viewers/common/tree_generator_test.ts +++ b/tools/winscope/src/viewers/common/tree_generator_test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TreeUtils} from 'common/utils/tree_utils'; +import {TreeUtils} from 'common/tree_utils'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import {TreeGenerator} from 'viewers/common/tree_generator'; import {DiffType, HierarchyTreeNode} from 'viewers/common/ui_tree_utils'; diff --git a/tools/winscope/src/viewers/common/tree_transformer.ts b/tools/winscope/src/viewers/common/tree_transformer.ts index d374cfe93..4754991e5 100644 --- a/tools/winscope/src/viewers/common/tree_transformer.ts +++ b/tools/winscope/src/viewers/common/tree_transformer.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import ObjectFormatter from 'common/trace/flickerlib/ObjectFormatter'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {FilterType, TreeNode} from 'common/utils/tree_utils'; +import {FilterType, TreeNode} from 'common/tree_utils'; +import ObjectFormatter from 'trace/flickerlib/ObjectFormatter'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import { DiffType, diff --git a/tools/winscope/src/viewers/common/tree_transformer_test.ts b/tools/winscope/src/viewers/common/tree_transformer_test.ts index 1cfa64219..03d1a25de 100644 --- a/tools/winscope/src/viewers/common/tree_transformer_test.ts +++ b/tools/winscope/src/viewers/common/tree_transformer_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TreeUtils} from 'common/utils/tree_utils'; +import {TreeUtils} from 'common/tree_utils'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import {TreeTransformer} from 'viewers/common/tree_transformer'; import {DiffType, HierarchyTreeNode} from 'viewers/common/ui_tree_utils'; diff --git a/tools/winscope/src/viewers/common/viewer_input_method.ts b/tools/winscope/src/viewers/common/viewer_input_method.ts index 9b0a37273..a37260446 100644 --- a/tools/winscope/src/viewers/common/viewer_input_method.ts +++ b/tools/winscope/src/viewers/common/viewer_input_method.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ImeUiData} from 'viewers/common/ime_ui_data'; import {PresenterInputMethod} from 'viewers/common/presenter_input_method'; import {ViewerEvents} from 'viewers/common/viewer_events'; diff --git a/tools/winscope/src/viewers/components/hierarchy_component.ts b/tools/winscope/src/viewers/components/hierarchy_component.ts index 9633fbbfc..4163021b4 100644 --- a/tools/winscope/src/viewers/components/hierarchy_component.ts +++ b/tools/winscope/src/viewers/components/hierarchy_component.ts @@ -14,8 +14,8 @@ * limitations under the License. */ import {Component, ElementRef, Inject, Input} from '@angular/core'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceType} from 'trace/trace_type'; import {TableProperties} from 'viewers/common/table_properties'; import {HierarchyTreeNode, UiTreeNode, UiTreeUtils} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; diff --git a/tools/winscope/src/viewers/components/hierarchy_component_test.ts b/tools/winscope/src/viewers/components/hierarchy_component_test.ts index 6e7a2efd8..33b8417e8 100644 --- a/tools/winscope/src/viewers/components/hierarchy_component_test.ts +++ b/tools/winscope/src/viewers/components/hierarchy_component_test.ts @@ -21,7 +21,7 @@ import {MatDividerModule} from '@angular/material/divider'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatInputModule} from '@angular/material/input'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; import {TreeComponent} from 'viewers/components/tree_component'; import {TreeNodeComponent} from 'viewers/components/tree_node_component'; diff --git a/tools/winscope/src/viewers/components/properties_component.ts b/tools/winscope/src/viewers/components/properties_component.ts index b57b2d169..098e4ee07 100644 --- a/tools/winscope/src/viewers/components/properties_component.ts +++ b/tools/winscope/src/viewers/components/properties_component.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import {Component, ElementRef, Inject, Input} from '@angular/core'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import {PropertiesTreeNode, Terminal} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; import {ViewerEvents} from 'viewers/common/viewer_events'; diff --git a/tools/winscope/src/viewers/components/property_groups_component.ts b/tools/winscope/src/viewers/components/property_groups_component.ts index b81235479..d13b470ea 100644 --- a/tools/winscope/src/viewers/components/property_groups_component.ts +++ b/tools/winscope/src/viewers/components/property_groups_component.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import {Component, Input} from '@angular/core'; -import {Layer} from 'common/trace/flickerlib/common'; +import {Layer} from 'trace/flickerlib/common'; @Component({ selector: 'property-groups', diff --git a/tools/winscope/src/viewers/components/transform_matrix_component.ts b/tools/winscope/src/viewers/components/transform_matrix_component.ts index cc1955499..36959cca2 100644 --- a/tools/winscope/src/viewers/components/transform_matrix_component.ts +++ b/tools/winscope/src/viewers/components/transform_matrix_component.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import {Component, Input} from '@angular/core'; -import {Transform} from 'common/trace/flickerlib/common'; +import {Transform} from 'trace/flickerlib/common'; @Component({ selector: 'transform-matrix', diff --git a/tools/winscope/src/viewers/components/tree_component.ts b/tools/winscope/src/viewers/components/tree_component.ts index 64c2cad96..9d7db1e5e 100644 --- a/tools/winscope/src/viewers/components/tree_component.ts +++ b/tools/winscope/src/viewers/components/tree_component.ts @@ -22,8 +22,8 @@ import { Input, Output, } from '@angular/core'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceType} from 'trace/trace_type'; import {HierarchyTreeNode, UiTreeNode, UiTreeUtils} from 'viewers/common/ui_tree_utils'; import {nodeStyles, treeNodeDataViewStyles} from 'viewers/components/styles/node.styles'; diff --git a/tools/winscope/src/viewers/components/tree_component_test.ts b/tools/winscope/src/viewers/components/tree_component_test.ts index da6648d4c..86a82a4a5 100644 --- a/tools/winscope/src/viewers/components/tree_component_test.ts +++ b/tools/winscope/src/viewers/components/tree_component_test.ts @@ -15,7 +15,7 @@ */ import {Component, NO_ERRORS_SCHEMA, ViewChild} from '@angular/core'; import {ComponentFixture, ComponentFixtureAutoDetect, TestBed} from '@angular/core/testing'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; import {UiTreeNode} from 'viewers/common/ui_tree_utils'; import {TreeComponent} from './tree_component'; diff --git a/tools/winscope/src/viewers/components/viewer_input_method_component.ts b/tools/winscope/src/viewers/components/viewer_input_method_component.ts index e0803b64e..d51813f1e 100644 --- a/tools/winscope/src/viewers/components/viewer_input_method_component.ts +++ b/tools/winscope/src/viewers/components/viewer_input_method_component.ts @@ -15,8 +15,8 @@ */ import {Component, Input} from '@angular/core'; import {TRACE_INFO} from 'app/trace_info'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceType} from 'trace/trace_type'; import {ImeUiData} from 'viewers/common/ime_ui_data'; @Component({ diff --git a/tools/winscope/src/viewers/viewer.ts b/tools/winscope/src/viewers/viewer.ts index 344cdd93e..a4bab2060 100644 --- a/tools/winscope/src/viewers/viewer.ts +++ b/tools/winscope/src/viewers/viewer.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; enum ViewType { TAB, diff --git a/tools/winscope/src/viewers/viewer_factory.ts b/tools/winscope/src/viewers/viewer_factory.ts index b3a00f0b5..e281c02dd 100644 --- a/tools/winscope/src/viewers/viewer_factory.ts +++ b/tools/winscope/src/viewers/viewer_factory.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {Viewer} from './viewer'; import {ViewerInputMethodClients} from './viewer_input_method_clients/viewer_input_method_clients'; import {ViewerInputMethodManagerService} from './viewer_input_method_manager_service/viewer_input_method_manager_service'; diff --git a/tools/winscope/src/viewers/viewer_input_method_clients/presenter_input_method_clients_test.ts b/tools/winscope/src/viewers/viewer_input_method_clients/presenter_input_method_clients_test.ts index bff48ddfd..d80e2b602 100644 --- a/tools/winscope/src/viewers/viewer_input_method_clients/presenter_input_method_clients_test.ts +++ b/tools/winscope/src/viewers/viewer_input_method_clients/presenter_input_method_clients_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; +import {TraceType} from 'trace/trace_type'; import {executePresenterInputMethodTests} from 'viewers/common/presenter_input_method_test_utils'; import {PresenterInputMethodClients} from './presenter_input_method_clients'; diff --git a/tools/winscope/src/viewers/viewer_input_method_clients/viewer_input_method_clients.ts b/tools/winscope/src/viewers/viewer_input_method_clients/viewer_input_method_clients.ts index 1171b14c0..152d79f0f 100644 --- a/tools/winscope/src/viewers/viewer_input_method_clients/viewer_input_method_clients.ts +++ b/tools/winscope/src/viewers/viewer_input_method_clients/viewer_input_method_clients.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ViewerInputMethod} from 'viewers/common/viewer_input_method'; import {View, ViewType} from 'viewers/viewer'; import {PresenterInputMethodClients} from './presenter_input_method_clients'; diff --git a/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service.ts b/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service.ts index dc8d45eee..5b40e1c08 100644 --- a/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service.ts +++ b/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceTreeNode} from 'common/trace/trace_tree_node'; +import {TraceTreeNode} from 'trace/trace_tree_node'; import {ImeAdditionalProperties} from 'viewers/common/ime_additional_properties'; import {ImeUtils} from 'viewers/common/ime_utils'; import {PresenterInputMethod} from 'viewers/common/presenter_input_method'; diff --git a/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service_test.ts b/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service_test.ts index c92ba8145..553f11032 100644 --- a/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service_test.ts +++ b/tools/winscope/src/viewers/viewer_input_method_manager_service/presenter_input_method_manager_service_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; +import {TraceType} from 'trace/trace_type'; import {executePresenterInputMethodTests} from 'viewers/common/presenter_input_method_test_utils'; import {PresenterInputMethodManagerService} from './presenter_input_method_manager_service'; diff --git a/tools/winscope/src/viewers/viewer_input_method_manager_service/viewer_input_method_manager_service.ts b/tools/winscope/src/viewers/viewer_input_method_manager_service/viewer_input_method_manager_service.ts index 205b18a79..8edf55992 100644 --- a/tools/winscope/src/viewers/viewer_input_method_manager_service/viewer_input_method_manager_service.ts +++ b/tools/winscope/src/viewers/viewer_input_method_manager_service/viewer_input_method_manager_service.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ViewerInputMethod} from 'viewers/common/viewer_input_method'; import {View, ViewType} from 'viewers/viewer'; import {PresenterInputMethodManagerService} from './presenter_input_method_manager_service'; diff --git a/tools/winscope/src/viewers/viewer_input_method_service/presenter_input_method_service_test.ts b/tools/winscope/src/viewers/viewer_input_method_service/presenter_input_method_service_test.ts index 4f75f1886..872b8b61f 100644 --- a/tools/winscope/src/viewers/viewer_input_method_service/presenter_input_method_service_test.ts +++ b/tools/winscope/src/viewers/viewer_input_method_service/presenter_input_method_service_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; +import {TraceType} from 'trace/trace_type'; import {executePresenterInputMethodTests} from 'viewers/common/presenter_input_method_test_utils'; import {PresenterInputMethodService} from './presenter_input_method_service'; diff --git a/tools/winscope/src/viewers/viewer_input_method_service/viewer_input_method_service.ts b/tools/winscope/src/viewers/viewer_input_method_service/viewer_input_method_service.ts index 405e6a1ae..420099ecc 100644 --- a/tools/winscope/src/viewers/viewer_input_method_service/viewer_input_method_service.ts +++ b/tools/winscope/src/viewers/viewer_input_method_service/viewer_input_method_service.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ViewerInputMethod} from 'viewers/common/viewer_input_method'; import {View, ViewType} from 'viewers/viewer'; import {PresenterInputMethodService} from './presenter_input_method_service'; diff --git a/tools/winscope/src/viewers/viewer_protolog/presenter.ts b/tools/winscope/src/viewers/viewer_protolog/presenter.ts index 0de37cf9d..279695219 100644 --- a/tools/winscope/src/viewers/viewer_protolog/presenter.ts +++ b/tools/winscope/src/viewers/viewer_protolog/presenter.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LogMessage, ProtoLogTraceEntry} from 'common/trace/protolog'; -import {TraceType} from 'common/trace/trace_type'; -import {ArrayUtils} from 'common/utils/array_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {LogMessage, ProtoLogTraceEntry} from 'trace/protolog'; +import {TraceType} from 'trace/trace_type'; import {UiData} from './ui_data'; export class Presenter { diff --git a/tools/winscope/src/viewers/viewer_protolog/presenter_test.ts b/tools/winscope/src/viewers/viewer_protolog/presenter_test.ts index b6397f38e..2b9097da7 100644 --- a/tools/winscope/src/viewers/viewer_protolog/presenter_test.ts +++ b/tools/winscope/src/viewers/viewer_protolog/presenter_test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LogMessage, ProtoLogTraceEntry} from 'common/trace/protolog'; -import {TraceType} from 'common/trace/trace_type'; +import {LogMessage, ProtoLogTraceEntry} from 'trace/protolog'; +import {TraceType} from 'trace/trace_type'; import {Presenter} from './presenter'; import {UiData} from './ui_data'; diff --git a/tools/winscope/src/viewers/viewer_protolog/ui_data.ts b/tools/winscope/src/viewers/viewer_protolog/ui_data.ts index d15a4e995..dbb19a763 100644 --- a/tools/winscope/src/viewers/viewer_protolog/ui_data.ts +++ b/tools/winscope/src/viewers/viewer_protolog/ui_data.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LogMessage} from 'common/trace/protolog'; +import {LogMessage} from 'trace/protolog'; class UiData { constructor( diff --git a/tools/winscope/src/viewers/viewer_protolog/viewer_protolog.ts b/tools/winscope/src/viewers/viewer_protolog/viewer_protolog.ts index 14092f0cb..7e9b09ea8 100644 --- a/tools/winscope/src/viewers/viewer_protolog/viewer_protolog.ts +++ b/tools/winscope/src/viewers/viewer_protolog/viewer_protolog.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {View, Viewer, ViewType} from 'viewers/viewer'; import {Events} from './events'; import {Presenter} from './presenter'; diff --git a/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording.ts b/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording.ts index 33340a13d..4b41d885b 100644 --- a/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording.ts +++ b/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; -import {TraceType} from 'common/trace/trace_type'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; +import {TraceType} from 'trace/trace_type'; import {View, Viewer, ViewType} from 'viewers/viewer'; class ViewerScreenRecording implements Viewer { diff --git a/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording_component.ts b/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording_component.ts index d4794562c..60c17d042 100644 --- a/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording_component.ts +++ b/tools/winscope/src/viewers/viewer_screen_recording/viewer_screen_recording_component.ts @@ -15,7 +15,7 @@ */ import {Component, ElementRef, Inject, Input} from '@angular/core'; import {DomSanitizer, SafeUrl} from '@angular/platform-browser'; -import {ScreenRecordingTraceEntry} from 'common/trace/screen_recording'; +import {ScreenRecordingTraceEntry} from 'trace/screen_recording'; @Component({ selector: 'viewer-screen-recording', diff --git a/tools/winscope/src/viewers/viewer_surface_flinger/presenter.ts b/tools/winscope/src/viewers/viewer_surface_flinger/presenter.ts index d6c9ff00f..45c0a2357 100644 --- a/tools/winscope/src/viewers/viewer_surface_flinger/presenter.ts +++ b/tools/winscope/src/viewers/viewer_surface_flinger/presenter.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Layer, LayerTraceEntry} from 'common/trace/flickerlib/common'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStoreProxy} from 'common/utils/persistent_store_proxy'; -import {FilterType, TreeUtils} from 'common/utils/tree_utils'; +import {PersistentStoreProxy} from 'common/persistent_store_proxy'; +import {FilterType, TreeUtils} from 'common/tree_utils'; +import {Layer, LayerTraceEntry} from 'trace/flickerlib/common'; +import {TraceType} from 'trace/trace_type'; import {Rectangle, RectMatrix, RectTransform} from 'viewers/common/rectangle'; import {TreeGenerator} from 'viewers/common/tree_generator'; import {TreeTransformer} from 'viewers/common/tree_transformer'; diff --git a/tools/winscope/src/viewers/viewer_surface_flinger/presenter_test.ts b/tools/winscope/src/viewers/viewer_surface_flinger/presenter_test.ts index 336d37070..ddb22becc 100644 --- a/tools/winscope/src/viewers/viewer_surface_flinger/presenter_test.ts +++ b/tools/winscope/src/viewers/viewer_surface_flinger/presenter_test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LayerTraceEntry} from 'common/trace/flickerlib/common'; -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; import {MockStorage} from 'test/unit/mock_storage'; import {UnitTestUtils} from 'test/unit/utils'; +import {LayerTraceEntry} from 'trace/flickerlib/common'; +import {TraceType} from 'trace/trace_type'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; import {Presenter} from './presenter'; diff --git a/tools/winscope/src/viewers/viewer_surface_flinger/ui_data.ts b/tools/winscope/src/viewers/viewer_surface_flinger/ui_data.ts index e9b68e1ac..f44df029b 100644 --- a/tools/winscope/src/viewers/viewer_surface_flinger/ui_data.ts +++ b/tools/winscope/src/viewers/viewer_surface_flinger/ui_data.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Layer} from 'common/trace/flickerlib/common'; -import {TraceType} from 'common/trace/trace_type'; +import {Layer} from 'trace/flickerlib/common'; +import {TraceType} from 'trace/trace_type'; import {Rectangle} from 'viewers/common/rectangle'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; diff --git a/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger.ts b/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger.ts index 056a66ddc..2d1d83c06 100644 --- a/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger.ts +++ b/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {ViewerEvents} from 'viewers/common/viewer_events'; import {View, Viewer, ViewType} from 'viewers/viewer'; import {Presenter} from './presenter'; diff --git a/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger_component.ts b/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger_component.ts index 390ce3ffc..561312687 100644 --- a/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger_component.ts +++ b/tools/winscope/src/viewers/viewer_surface_flinger/viewer_surface_flinger_component.ts @@ -15,8 +15,8 @@ */ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {TRACE_INFO} from 'app/trace_info'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceType} from 'trace/trace_type'; import {UiData} from './ui_data'; @Component({ diff --git a/tools/winscope/src/viewers/viewer_transactions/presenter.ts b/tools/winscope/src/viewers/viewer_transactions/presenter.ts index aa30a534e..b6330b331 100644 --- a/tools/winscope/src/viewers/viewer_transactions/presenter.ts +++ b/tools/winscope/src/viewers/viewer_transactions/presenter.ts @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import ObjectFormatter from 'common/trace/flickerlib/ObjectFormatter'; -import {ElapsedTimestamp, RealTimestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; -import {TransactionsTraceEntry} from 'common/trace/transactions'; -import {ArrayUtils} from 'common/utils/array_utils'; -import {TimeUtils} from 'common/utils/time_utils'; +import {ArrayUtils} from 'common/array_utils'; +import {TimeUtils} from 'common/time_utils'; +import ObjectFormatter from 'trace/flickerlib/ObjectFormatter'; +import {ElapsedTimestamp, RealTimestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; +import {TransactionsTraceEntry} from 'trace/transactions'; import {PropertiesTreeGenerator} from 'viewers/common/properties_tree_generator'; import {PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UiData, UiDataEntry, UiDataEntryType} from './ui_data'; diff --git a/tools/winscope/src/viewers/viewer_transactions/presenter_test.ts b/tools/winscope/src/viewers/viewer_transactions/presenter_test.ts index ccdb969d4..7fc7f1675 100644 --- a/tools/winscope/src/viewers/viewer_transactions/presenter_test.ts +++ b/tools/winscope/src/viewers/viewer_transactions/presenter_test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Timestamp, TimestampType} from 'common/trace/timestamp'; -import {TraceType} from 'common/trace/trace_type'; import {Parser} from 'parsers/parser'; import {UnitTestUtils} from 'test/unit/utils'; -import {TransactionsTraceEntry} from '../../common/trace/transactions'; +import {Timestamp, TimestampType} from 'trace/timestamp'; +import {TraceType} from 'trace/trace_type'; +import {TransactionsTraceEntry} from 'trace/transactions'; import {Presenter} from './presenter'; import {UiData, UiDataEntryType} from './ui_data'; diff --git a/tools/winscope/src/viewers/viewer_transactions/viewer_transactions.ts b/tools/winscope/src/viewers/viewer_transactions/viewer_transactions.ts index 917938bc3..534c9ee8d 100644 --- a/tools/winscope/src/viewers/viewer_transactions/viewer_transactions.ts +++ b/tools/winscope/src/viewers/viewer_transactions/viewer_transactions.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {View, Viewer, ViewType} from 'viewers/viewer'; import {Events} from './events'; import {Presenter} from './presenter'; diff --git a/tools/winscope/src/viewers/viewer_window_manager/presenter.ts b/tools/winscope/src/viewers/viewer_window_manager/presenter.ts index bdeca9891..85e84e3be 100644 --- a/tools/winscope/src/viewers/viewer_window_manager/presenter.ts +++ b/tools/winscope/src/viewers/viewer_window_manager/presenter.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import DisplayContent from 'common/trace/flickerlib/windows/DisplayContent'; -import {TraceTreeNode} from 'common/trace/trace_tree_node'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStoreProxy} from 'common/utils/persistent_store_proxy'; -import {FilterType, TreeUtils} from 'common/utils/tree_utils'; +import {PersistentStoreProxy} from 'common/persistent_store_proxy'; +import {FilterType, TreeUtils} from 'common/tree_utils'; +import DisplayContent from 'trace/flickerlib/windows/DisplayContent'; +import {TraceTreeNode} from 'trace/trace_tree_node'; +import {TraceType} from 'trace/trace_type'; import {Rectangle, RectMatrix, RectTransform} from 'viewers/common/rectangle'; import {TreeGenerator} from 'viewers/common/tree_generator'; import {TreeTransformer} from 'viewers/common/tree_transformer'; diff --git a/tools/winscope/src/viewers/viewer_window_manager/presenter_test.ts b/tools/winscope/src/viewers/viewer_window_manager/presenter_test.ts index 3a71fca86..5eccbdbd2 100644 --- a/tools/winscope/src/viewers/viewer_window_manager/presenter_test.ts +++ b/tools/winscope/src/viewers/viewer_window_manager/presenter_test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {WindowManagerState} from 'common/trace/flickerlib/common'; -import {TraceType} from 'common/trace/trace_type'; import {HierarchyTreeBuilder} from 'test/unit/hierarchy_tree_builder'; import {MockStorage} from 'test/unit/mock_storage'; import {UnitTestUtils} from 'test/unit/utils'; +import {WindowManagerState} from 'trace/flickerlib/common'; +import {TraceType} from 'trace/trace_type'; import {VISIBLE_CHIP} from 'viewers/common/chip'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; diff --git a/tools/winscope/src/viewers/viewer_window_manager/ui_data.ts b/tools/winscope/src/viewers/viewer_window_manager/ui_data.ts index bc471a4b6..6f472b4af 100644 --- a/tools/winscope/src/viewers/viewer_window_manager/ui_data.ts +++ b/tools/winscope/src/viewers/viewer_window_manager/ui_data.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; +import {TraceType} from 'trace/trace_type'; import {Rectangle} from 'viewers/common/rectangle'; import {HierarchyTreeNode, PropertiesTreeNode} from 'viewers/common/ui_tree_utils'; import {UserOptions} from 'viewers/common/user_options'; diff --git a/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager.ts b/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager.ts index f8e9a799f..be7066622 100644 --- a/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager.ts +++ b/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TraceType} from 'common/trace/trace_type'; import {MockStorage} from 'test/unit/mock_storage'; +import {TraceType} from 'trace/trace_type'; import {ViewerEvents} from 'viewers/common/viewer_events'; import {View, Viewer, ViewType} from 'viewers/viewer'; import {Presenter} from './presenter'; diff --git a/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager_component.ts b/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager_component.ts index de694b21a..d58808356 100644 --- a/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager_component.ts +++ b/tools/winscope/src/viewers/viewer_window_manager/viewer_window_manager_component.ts @@ -15,8 +15,8 @@ */ import {Component, Input} from '@angular/core'; import {TRACE_INFO} from 'app/trace_info'; -import {TraceType} from 'common/trace/trace_type'; -import {PersistentStore} from 'common/utils/persistent_store'; +import {PersistentStore} from 'common/persistent_store'; +import {TraceType} from 'trace/trace_type'; import {UiData} from './ui_data'; @Component({