diff --git a/tools/winscope/.gitignore b/tools/winscope/.gitignore index 845ccaeff..2153ce476 100644 --- a/tools/winscope/.gitignore +++ b/tools/winscope/.gitignore @@ -2,3 +2,4 @@ node_modules/ adb_proxy/venv/ .vscode/ dist/ +yarn-error.log \ No newline at end of file diff --git a/tools/winscope/package.json b/tools/winscope/package.json index 617f577db..384c8f684 100644 --- a/tools/winscope/package.json +++ b/tools/winscope/package.json @@ -10,13 +10,13 @@ }, "dependencies": { "vue": "^2.3.3", - "vue-material": "0.8.1" + "vue-material": "^1.0.0-beta-11" }, "devDependencies": { "babel-core": "^6.0.0", "babel-loader": "^6.0.0", "babel-preset-env": "^1.5.1", - "cross-env": "^3.0.0", + "cross-env": "^7.0.2", "css-loader": "^0.25.0", "file-loader": "^0.9.0", "html-webpack-inline-source-plugin": "^0.0.9", diff --git a/tools/winscope/src/App.vue b/tools/winscope/src/App.vue index 6e724313f..755d96122 100644 --- a/tools/winscope/src/App.vue +++ b/tools/winscope/src/App.vue @@ -14,29 +14,59 @@ --> diff --git a/tools/winscope/src/DataAdb.vue b/tools/winscope/src/DataAdb.vue index 39665dd53..f1853a4ef 100644 --- a/tools/winscope/src/DataAdb.vue +++ b/tools/winscope/src/DataAdb.vue @@ -18,7 +18,7 @@
ADB Connect
- + error @@ -52,10 +52,10 @@ lock Proxy authorisation required - + - +
The proxy token is printed to console on proxy launch, copy and paste it above.
Connect @@ -65,15 +65,17 @@
{{ Object.keys(devices).length > 0 ? "Connected devices:" : "No devices detected" }}
- {{ device.authorised ? "smartphone" : "screen_lock_portrait" }}{{ device.authorised ? device.model : "unauthorised" }} ({{ id }}) + {{ device.authorised ? "smartphone" : "screen_lock_portrait" }} + {{ device.authorised ? device.model : "unauthorised" }} ({{ id }}) - + - smartphone{{ devices[selectedDevice].model }} ({{ selectedDevice }}) + smartphone + {{ devices[selectedDevice].model }} ({{ selectedDevice }})
@@ -84,7 +86,7 @@

Dump targets:

{{FILE_TYPES[file].name}}
-
+
Start trace Dump state Device list @@ -100,14 +102,14 @@ Tracing... - -
+ +
End trace
Loading data... - + diff --git a/tools/winscope/src/DataFilter.vue b/tools/winscope/src/DataFilter.vue index b675b5af2..79c4c6747 100644 --- a/tools/winscope/src/DataFilter.vue +++ b/tools/winscope/src/DataFilter.vue @@ -14,15 +14,17 @@ --> diff --git a/tools/winscope/src/TraceView.vue b/tools/winscope/src/TraceView.vue index 0cdd581b2..98d94a79a 100644 --- a/tools/winscope/src/TraceView.vue +++ b/tools/winscope/src/TraceView.vue @@ -15,29 +15,29 @@