Commit Graph

33316 Commits

Author SHA1 Message Date
Hui Ling Shi
2a80be87df [3] Add WM&SF Properties sub-panel in IME panels
If there are WM or SF trace entries that correspond with IME trace
entries (i.e. the WM/SF entry comes before the IME entry in time),
the 'WM & SF Properties' sub-panel will be displayed below the
'Hierarchy' sub-panel in the IME trace panel.

- This sub-panel currently displays properties extracted from
WM entry, not yet SF entry.
- Code is added in 'ime_processing.js' to extract WM properties,
and 'freeze: false' is set in 'transform_ime.js' so that IME entry
objects are not frozen and can be modified during processing
- SF entry, displayed as a tree in the Hierarchy sub-panel, is pruned
to only ImeContainer or IME-snapshot node and its sibling nodes.

Note: there is a bug in this CL (b/236679852) that is fixed later
in CL[6]. Also, null values are not handled well in this CL, and
will be fixed later in CL[4].

Screenshot: https://screenshot.googleplex.com/6RXiRyX47qLAL9i.png

Bug: 236226833
Test: manual on local winscope

Change-Id: I07be7f492a6275c3fdafd6d1f523fdf4d552d16b
2022-07-01 07:47:50 +00:00
Hongwei Wang
f1361d0f72 Add ability to enter PiP on back pressed in ApiDemos am: 8d408e82c1 am: a31acd7dbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19087608

Change-Id: Ica6ceae87d5e68f62543c9c2740f344efecd5c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 16:49:10 +00:00
Hongwei Wang
a31acd7dbf Add ability to enter PiP on back pressed in ApiDemos am: 8d408e82c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19087608

Change-Id: I79c7aa2fe00e6fed0f2c7e88b955d2c24b6c490d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 16:45:58 +00:00
Mu-Le Lee
a33163bc07 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a am: 3e5585e896 am: 4d7c3e3dc5
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I8bbaa825698a67d4583465a51fae12eee81cb1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:48:29 +00:00
Treehugger Robot
4241cc5b9e Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6 am: c9c1fbdd18 am: c5e8ab9a80
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: I2e4874c61309b77a98148e42495575ba424d2896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:43:42 +00:00
Anton Hansson
03d4fedca7 Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e am: a0d2f8f91d am: 81422e4bce
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I07a581d91407aa2deba4f22c27650923300338eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:16:01 +00:00
Mu-Le Lee
4d7c3e3dc5 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a am: 3e5585e896
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I607d2a090d40f9d55c52d1d8ad2770e46ff35d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:12:28 +00:00
Treehugger Robot
c5e8ab9a80 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6 am: c9c1fbdd18
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: I5623216acb3a72405c9e5fc5d80777d33527ba10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:11:09 +00:00
Anton Hansson
81422e4bce Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e am: a0d2f8f91d
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I2468567cbfe69498129d6e0ad2fe087171f57d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:01:21 +00:00
Hongwei Wang
8d408e82c1 Add ability to enter PiP on back pressed in ApiDemos
Bug: 235268241
Test: Press back when in com.example.android.apis/.app.PictureInPicture
Change-Id: I8ceaaf3b1215505bd4919ef5f5da291df62c1049
2022-06-27 11:27:03 -07:00
Mu-Le Lee
3e5585e896 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I4865cc71310d059c65a0919b28b3100fa0b97d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:40:49 +00:00
Mu-Le Lee
4841d51f3a Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I7a25c758749f334dd51d5dac2438c68a5467bec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:22:46 +00:00
Mu-Le Lee
54447f3246 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I84fe081ed2177c8ad2c05c742083c8f5f2133d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:06:01 +00:00
Mu-Le Lee
aa22b20007 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." 2022-06-27 05:25:47 +00:00
Mu-Le Lee
b55856ae03 Remove location information of unnamed elements in dumps to avoid automerge conflict.
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236800109
Change-Id: I811d9508166f11f7e69ccbc554bcac8b1f122be6
2022-06-27 03:48:03 +00:00
Treehugger Robot
c9c1fbdd18 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Ifad0fba555aa1e5b4414669302342bac1c130d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:12:52 +00:00
Anton Hansson
a0d2f8f91d Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I5960b60f3ed7b15a1f5e783e3622151082857af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:01:51 +00:00
Treehugger Robot
30d11fa9d6 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Id6136530e710f10027daf81bd03e7378a2978bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:47:15 +00:00
Anton Hansson
73e60a237e Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I821845373321b77c7c99d46709dc76ea3fc44780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:36:58 +00:00
Treehugger Robot
8a02c886f1 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Id4db0018932c7a2ac9784df08b2c15e4098dcb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:15:53 +00:00
Anton Hansson
3a18655006 Merge "Dist merged system annotation zip" am: 6c8cfa3386
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: Id5feedb84b5be4969f11aa734c82f6b310dc0791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:13:47 +00:00
Treehugger Robot
1da99cc99e Merge "c2a: add option to use Cargo.toml.orig" 2022-06-23 15:34:41 +00:00
Anton Hansson
6c8cfa3386 Merge "Dist merged system annotation zip" 2022-06-23 15:07:10 +00:00
Jeff Vander Stoep
2adbd7ed89 c2a: add option to use Cargo.toml.orig
`Cargo --publish` strips dev-dependencies from Cargo.toml, an issue
that won't be fixed until [1] is resolved, which doesn't seem
likely as it has been open for ~5 years now.

cargo2android needs dev-dependencies listed in Cargo.toml in order
to generate the rust_test in Android.bp, add an option that tells
cargo2android to use the cargo.toml.orig instead of the cargo.toml.

With this change there are now two options that temporarily
update Cargo.toml, so I've pulled these out into a separate class
to clean up the code a bit.

[1] https://github.com/rust-lang/cargo/issues/4242

Test: run against projects with --add_workspace and
--orig-cargo-toml

Change-Id: I3b8633a807c9734981ebde0bef9b73868acf6774
2022-06-23 16:38:08 +02:00
Hui Ling Shi
7b1212ee06 Merge "[2] Add IME processing for ADB-captured traces" 2022-06-23 10:56:50 +00:00
Anton Hansson
8e63be9278 Dist merged system annotation zip
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.

Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
2022-06-23 10:14:39 +00:00
Hui Ling Shi
6744711cba [2] Add IME processing for ADB-captured traces
IME processing refers to adding WM and SF properties into corresponding
IME entries. Shared functions for this are in 'ime_processing.js',
called when IME and WM / SF traces are input via both ADB or file upload.

- WM and SF entries are displayed as nodes in the 'Hierarchy' sub-panel
of IME panels.
- The SF entry is pruned to only the branch containing 'ImeContainer'
node.
- The WM entry is not yet filtered.

Screenshots:
- Before: https://screenshot.googleplex.com/BYU279cqkTQ5iBP.png
- After: https://screenshot.googleplex.com/3Uhj3XBcpp9Cc6u.png
- Note: screenshots only show 1 IME panel; same changes are made to
all 3 IME panels

Bug: 236226833
Test: manual via local Winscope

CL[1]: If64aff9e899363188010633758e36be474666984

Change-Id: I31d96a43769d64d1e0151b8d620d9d5beaaf7e79
2022-06-23 08:47:01 +00:00
Treehugger Robot
20bafdf891 Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b am: 3db273523f am: a101e35631 am: f5f57fda37
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: I235bc0171047a57053871c142f02cf2d5bad592f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 21:04:11 +00:00
Treehugger Robot
f5f57fda37 Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b am: 3db273523f am: a101e35631
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: I9e63ead336af3168f5697a9a8fe2b938a2d1da37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:37:48 +00:00
Treehugger Robot
a101e35631 Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b am: 3db273523f
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: I189aa0552a6dd7b410170ce12c8a63878d211644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:19:50 +00:00
Treehugger Robot
3db273523f Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: Ifcc25702cfb515b26d9c1b51761d0d14d5933aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 20:00:51 +00:00
Treehugger Robot
b30e1dae5b Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: Id74b1089aaf900cd193327e6714ceaf4125dc90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:42:18 +00:00
Treehugger Robot
d0e21e93fb Merge "c2a: Automatically make crates APEX available" 2022-06-22 19:25:58 +00:00
Treehugger Robot
5b08f87a86 Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b am: 972cbb2a83 am: ea6cc3fbbb am: b03eb213d5 am: c0b44f5a02
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: I65aa6fff2cd51cc26cf154a4ef45bb15b99d1fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 09:45:23 +00:00
Treehugger Robot
c0b44f5a02 Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b am: 972cbb2a83 am: ea6cc3fbbb am: b03eb213d5
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: I80043619d8458b076f8bb7839407b211a08eff13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 09:21:42 +00:00
Treehugger Robot
b03eb213d5 Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b am: 972cbb2a83 am: ea6cc3fbbb
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: I299db9cb8540e7136fef17439e25b5ef8a480c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 09:04:01 +00:00
Treehugger Robot
ea6cc3fbbb Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b am: 972cbb2a83
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: Id38abf46ca6ddc06eca2dc4a69adb262486e12b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 08:45:52 +00:00
Treehugger Robot
972cbb2a83 Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: Id5ed56ed3d7f4431457d776499f010c53ed4daf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 08:29:09 +00:00
Treehugger Robot
8b3339921b Merge "Update tests due to clang variable and struct naming changes." 2022-06-22 07:58:27 +00:00
Hui Ling Shi
47fd714900 Merge "[1] Introduce beta feature flag for new Ime panels" 2022-06-22 05:40:56 +00:00
Hui Ling Shi
e32cd27b76 [1] Introduce beta feature flag for new Ime panels
Add a new toolbar at the top of the front page of Winscope app.
This toolbar will show a list of beta features and checkboxes for
users to choose whether to use the beta feature.

For now, the only beta feature is the new / improved UI version
of the ImeTrace panels (to be implemented in the next few CLs).

Bug: 236226833
Test: manual (on local winscope build)

Change-Id: If64aff9e899363188010633758e36be474666984
2022-06-22 04:30:49 +00:00
Mu-Le Lee
e5f137adf2 Update tests due to clang variable and struct naming changes.
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236780777
Change-Id: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
2022-06-22 04:10:43 +00:00
Raju Kulkarni
2af01f68ed Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617 am: f2a1d8b3e3 am: c917993814
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I1217dde51b378688d5d521e7fa7a7395e659d53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:13:12 +00:00
Raju Kulkarni
580830f15e Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617 am: 5ff7ceebcd am: 8f3a2a4c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: If87e5c9e28ae62e5990910e304db01a846f3fa34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:12:42 +00:00
Raju Kulkarni
98ee9d46d7 Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: d27810a4a1 am: 4fa642cb9b am: 5ad6bc9b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I0698fedff213556cbfc2227ed03048f180cb1fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:09:42 +00:00
Raju Kulkarni
c917993814 Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617 am: f2a1d8b3e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I708af2a420b65e4f14fd97d55bc3867a99b5f211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:50:47 +00:00
Raju Kulkarni
8f3a2a4c7c Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617 am: 5ff7ceebcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I369d62faa6181c764fb6c1c93caa6f35f12d7527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:42:49 +00:00
Raju Kulkarni
5ad6bc9b17 Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: d27810a4a1 am: 4fa642cb9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I2120d603d9a012074f943171a7b39dc32c91f2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:42:39 +00:00
Raju Kulkarni
5ff7ceebcd Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I63a8c4511723a96a17a66f1437f55e28f909d132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:25:52 +00:00
Raju Kulkarni
f2a1d8b3e3 Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba am: 6309a98617
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I128bc2102157a4904ee943e998b41f45ac275d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:25:50 +00:00