Commit Graph

18638 Commits

Author SHA1 Message Date
Issei Suzuki
2c7b85ea75 Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev am: 61a7196fb5 am: 4c6dc72a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439162

Change-Id: Ib1f65602940ecc25292ad10d2b24f48cffd9dca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:31:36 +00:00
Matt Casey
893b90752c Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa732 am: 1a9ac652f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18343548

Change-Id: Ie1f79ede14a4f6861180aa68108910da6e643f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:13:48 +00:00
TreeHugger Robot
c31d8ad724 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 am: 8c5b32dc04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988646

Change-Id: I49aa25148cc61daa7424c9fb32654fd410a4cf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:36 +00:00
Issei Suzuki
61a7196fb5 Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev 2022-05-18 09:29:22 +00:00
Matt Casey
2f6f3aa732 Merge "Style fixes for mini resolver" into tm-dev 2022-05-18 02:12:04 +00:00
Matt Casey
122b4a434a Style fixes for mini resolver
Make the icon 48dp.
Update button style to be opaque for "Open" and outlined for the browser
button.
Fix button padding at the bottom.

Test: Visual inspection with UX. Tested in gesture/3-button + light/dark
      theme
Bug: 175433480
Change-Id: I9304ee6fed28a467fcc54630dab18aaf4f140986
2022-05-17 16:55:21 +00:00
Issei Suzuki
b39d8489a3 Revert ProtoLog to Slog in framework.jar
ProtoLog is only supported in WM sources at this moment.
This partially reverts commit I4461eddd4a24c7bba1adef1571ce0fbf6d7db0a2.

Bug: 231342674
Test: Pass existing tests.
Change-Id: Ibe5ca4f8a18f92379e3aae8bd9c7c6f456df5810
2022-05-17 15:36:00 +00:00
TreeHugger Robot
05e61e90c5 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev 2022-05-16 20:59:24 +00:00
Song Hu
6493b1498b Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: Ied1f6e341c4722d13b1f56a55d47ff62351b7d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:39:04 +00:00
Song Hu
d581c08704 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev 2022-05-13 21:13:46 +00:00
Lucas Dupin
61a427b630 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2ff1af1a00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: Ia0ecf578de186cae25281604f5c7684e8dcec286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:40:43 +00:00
Lucas Dupin
5f5aa7e1ef Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev 2022-05-13 19:11:24 +00:00
Song Hu
bda0b769d6 Pass shared text content from ChooserActivity to AppPredictionService
Bug: 232426274
Test: manual test on local phone
Test: atest
Change-Id: Idc1d2f8efddab45cfaacd4a78cd745b9273b2719
2022-05-13 09:53:34 -07:00
Jing Ji
4f92fb5e95 Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff am: 66abf4d225
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: Ie1fdf2424be240e22d148e9ad79e028eae4a8c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:31:33 +00:00
Jing Ji
317e43a1ff Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev 2022-05-12 22:15:18 +00:00
Mark Renouf
cf44ea86ee Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 am: fcb64ad8cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: Ia39e2b59f5d4cf3fabf8f33fe7c3d7f2a3333dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 21:50:22 +00:00
Mark Renouf
7ab7a81845 Use System.nanoTime(), avoid desyncing frame times
The rendering pipeline expects frame vsync times as
System.nanoTime(). When the frame vsync time is behind
the most recent frame, the render request is dropped [*].

This reverts the value back to System.nanoTime() which
was accidentally changed in ag/15819081.

* frameworks/base/libs/hwui/renderthread/TimeLord.cpp:46

Bug: 217046739
Test: ???
Change-Id: I21d8737e7acb5ac13bfbcf150006415431d874aa
2022-05-12 20:44:09 +00:00
Michael Wachenschwanz
2c774935fa Merge "Skip collecting radio data on procstate change when radio is off." into tm-dev am: e59e5012cf am: e2a19d0bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246347

Change-Id: I4b958e1240e870cda5aa9b1a49be84f942f78119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 20:08:35 +00:00
Michael Wachenschwanz
e59e5012cf Merge "Skip collecting radio data on procstate change when radio is off." into tm-dev 2022-05-12 18:16:34 +00:00
lbill
166eaacd0e Instrument CUJ_VOLUME_CONTROL with Trace tag
1. CUJ_VOLUME_CONTROL begin in animator begin()
   CUJ_VOLUME_CONTROL end in animator end()
   - initDialog(): Tag show
   - dismissH(): Tag dismiss
   - updateVolumeRowSliderH(): Tag update

2. Add Trace.beginSection("VolumeDialogImpl#showH")
3. Add Trace.beginSection("VolumeDialogImpl#dismissH")
4. Add Trace.beginSection("VolumeDialogImpl#updateVolumeRowSliderH")
5. Add Trace.beginSection("VolumeDialogImpl#updateRowsH")

Bug: 232066671
Test: Press Volume key and check perfetto trace
Change-Id: Ib74bfc46bd6841d4b8e86266a75d7003ae4cbe80
2022-05-12 17:29:30 +00:00
Tom Hsu
35201c97f7 Merge "[Panlingual] Fix NPE when add language." into tm-dev am: 5c23d0292d am: 7239e76089
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18330351

Change-Id: I28636ed8e3ff0a2446ab53ba04b88d244cd81d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:53:07 +00:00
Tom Hsu
5c23d0292d Merge "[Panlingual] Fix NPE when add language." into tm-dev 2022-05-12 14:39:27 +00:00
Matt Casey
dd70303e26 Merge "Load app icon in miniresolver." into tm-dev am: 8cdbd6c00a am: 40ea565f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321625

Change-Id: I496c8f639b9a11cddbd78dbe6321369b877cf421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:50:26 +00:00
Matt Casey
8cdbd6c00a Merge "Load app icon in miniresolver." into tm-dev 2022-05-12 12:04:57 +00:00
Tom Hsu
c87751b0c2 [Panlingual] Fix NPE when add language.
Bug: b/232348161
Test: local

Change-Id: Ibd55603aebb72eea3e9b2b8c32177f73997cdeee
2022-05-12 09:02:21 +00:00
Song Hu
4cdd6e5441 Add shortcut title into pin label. Without shortcut title, the pin label does not make sense in non-English string. am: 82b7fd414d am: 0647b559de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18328646

Change-Id: I98f1d2efda6bec922e265385e3da2113544bc39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 02:43:14 +00:00
Song Hu
82b7fd414d Add shortcut title into pin label. Without shortcut title, the pin label does not make sense in non-English string.
Bug: 232198467
Test: manual test on local phone
Change-Id: I5a4760ffed87ed3e573eb4c48ef754e641853f61
2022-05-12 02:02:55 +00:00
Jing Ji
224522119b Always construct the UidProcessState instance in ProcessStats
Bug: 231241732
Test: atest ProcStatsValidationTests
Test: atest ProcessStatsDumpsysTest
Test: atest CtsIncidentHostTestCases:ProcStatsProtoTest
Change-Id: Ia3499757deea455c2dbc1ce2afd573a603ff3da1
2022-05-11 17:41:08 -07:00
Michael Wachenschwanz
de73c05b89 Skip collecting radio data on procstate change when radio is off.
Fixes: 229042376
Test: atest BatteryStatsNoteTest
Change-Id: I6b3c5a5c9416bc47b8dbb00e28c81d93e3507613
2022-05-11 14:37:45 -07:00
Matt Casey
931362feae Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: bf0d76e742
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: I7bc1bd4412c8504e836b33316adb408a410a58c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:14:36 +00:00
Calvin Pan
20d84a0348 Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d17b651d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872

Change-Id: I53f1b17222ff9c16e6d4849d936b6eb9f62ea2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:12:15 +00:00
Wu Ahan
585621f733 Merge "Instrument jank of CUJ take screen shot" into tm-dev am: 009099e89d am: caeed3687b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729988

Change-Id: I556e419ddfd2db610ef73138233938cf09e8dcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:47:02 +00:00
Tom Hsu
57a23f762b Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev am: a3352d9664 am: 2a8a624df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245866

Change-Id: I3e4952855f7940cbdbdcf6e59de5dd542ca33fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:46:08 +00:00
Matt Casey
7c3a2374be Load app icon in miniresolver.
Awkwardly used LoadIconTask from ResovlerActivity, but trying to
constrain change as much as possible given release timeline.

Also:
- Update paddings and font sizes per mocks
  (https://www.figma.com/file/sGebzybgbcKrK8nBiBSWc9/Intent-Picker-%26-Sendkit?node-id=1252%3A6083)

Bug: 175433480
Test: Visual inspection.
Change-Id: Id7606d358183733efdf69f5ef687dd71605e853e
2022-05-11 19:42:50 +00:00
Matt Casey
ad48cd89e0 Merge "Resolve NPE when mini resolver is rotated" into tm-dev 2022-05-11 16:47:13 +00:00
Calvin Pan
53c979939c Merge "Filter the locale not in resources" into tm-dev 2022-05-11 15:16:10 +00:00
Calvin Pan
42bb47de41 Filter the locale not in resources
Some 1p apps may not provide all the resources in the apk, need to
reply air update to download other language resources

Bug: 213980690
Test: Test apps that the locale in <locale-config> more than
resources.

Change-Id: I1c050ffc8bba76df42832a3641ddcba1111afd33
2022-05-11 08:02:58 +00:00
Wu Ahan
009099e89d Merge "Instrument jank of CUJ take screen shot" into tm-dev 2022-05-11 06:35:13 +00:00
Tom Hsu
a3352d9664 Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev 2022-05-11 05:51:00 +00:00
Song Hu
8b8119fead Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev am: 6c90bbe1cf am: a0d00523f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842

Change-Id: Iaefeb72adfd75022fd08d9ff51170ca609ac2a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:48:31 +00:00
Shawn Lin
37cb5d6000 Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace am: 4f89de8b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214

Change-Id: I3335e98b7286b05095649fecc643e00034a98c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:28:44 +00:00
Chaohui Wang
8b11b98210 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340 am: 92c8f95c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990

Change-Id: I77b1e8973868e27368f72bef0711b289f6a6b55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:17:41 +00:00
Joanne Chung
2a258726af [DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7 am: 2f1d74e382
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: If2545f01d020403281520a088f179aef9a0d9c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:07:20 +00:00
Alex Buynytskyy
acf37daaa0 Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e am: 6ba629058c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666

Change-Id: Ifc84157ae9d433fca4ff28a853ea1b89f48b1d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:44 +00:00
Matt Casey
755cc5b04d Resolve NPE when mini resolver is rotated
Was attempting to adjust padding on a View that didn't exist.

Also adding additional conditional behavior for similar issues:
- Fix the padding at the bottom based upon insets.
- Only trigger mini resolver for ResolverActivity itself.
- Add comments defining mini resolver.

Test: atest ResolverActivityTest
Test: Manual test of rotation not crashing and padding looking better.
Bug: 222497968
Bug: 175433480
Change-Id: Ie38787f61dc523bd812b828ec16830b91f61ce0b
2022-05-10 17:59:08 +00:00
Song Hu
6c90bbe1cf Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev 2022-05-10 15:23:31 +00:00
Shawn Lin
3ab2eccace Merge "Add multi-user support for kids mode" into tm-dev 2022-05-10 12:30:16 +00:00
tom hsu
75ed59fac9 [Panlingual][frameworks] Fix when tap search bar, will leave a big blank.
- Close blank layout after title disappear when search bar is expanded.

Bug: b/227287277
Test: local, see b/227287277#6
Change-Id: I6b5f6990cacf6da9e17b743519ae554af32f691d
2022-05-10 08:30:38 +00:00
Joanne Chung
2f1d74e382 [DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: Ide3562015e94c141d4eb97a9965a4d24fab6cfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:21:38 +00:00
Shawn Lin
2b9e4b6550 Add multi-user support for kids mode
Listener to ACTION_USER_SWITCH intent and update the settings key when
user switched.

Bug: 231575466
Test: 1. set different settings keys for different user.
      2. switch between users and see if the setting value is correct.
Change-Id: Ia1afcb6121b296b293bef0ba7d0a0be25b857554
2022-05-10 03:03:56 +00:00