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

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,

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,

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';

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';

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({

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';

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({

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({

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) {

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';

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};

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 {

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({

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';

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';

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;

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';
 

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;

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', () => {

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';

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';

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 {

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', () => {

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';
 

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

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 = [

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<void>;
 

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;
 

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;

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;

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({

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;

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';
 

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', () => {

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';
 

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';

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';

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', () => {

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';
 

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', () => {

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';

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', () => {

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';

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', () => {

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 {

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 {

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', () => {

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', () => {

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';
 

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', () => {

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', () => {

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';
 

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', () => {

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';
 

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';
 

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', () => {

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', () => {

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,

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 {

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<Parser> {

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,

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,

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,

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 {

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';
 

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';

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;

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 {

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';