Commit Graph

19040 Commits

Author SHA1 Message Date
Fiona Campbell
477064e500 Merge changes I36ea0ffc,I1f3797c5,I01aeeedd into tm-qpr-dev am: a01ccaae13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19638897

Change-Id: I32169097c0b807836bb989f60111cedcd49191b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:11:34 +00:00
Fiona Campbell
a01ccaae13 Merge changes I36ea0ffc,I1f3797c5,I01aeeedd into tm-qpr-dev
* changes:
  Add constraints to window duration scale
  Add constraints to animation duration scales
  Ensure animation scales are within bounds
2022-08-19 14:49:40 +00:00
TreeHugger Robot
d6a6060a26 Merge "Logs the activated session duration for magnification. (2/2)" into tm-qpr-dev am: 1c5d9e0c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185780

Change-Id: Ie96b62163da633023ffc4317ed92aaf13d9d04e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 09:18:11 +00:00
Daniel Hsieh
22783d8314 Logs the activated session duration for magnification. (2/2)
Uses the atom MagnificationFollowTypingFocusActivatedSessionReported in
westworld to log the activated session duration for the window magnifier
which its following typing focus is enabled.

The duration is accumulated by the time when the window magnifier and
the ime are all on. If one of them is off, we would pause the
accumulated timer. If a user moves the window magnifier to disables
this function, we would stop the accumulated timer and log the duration.

Bug: 216733714
Test: m statsd_testdrive & statsd_testdrive 453
      atest WindowMagnificationManagerTest
Change-Id: I994fc2a3ada8a90fde8b3a0b4f1cc8d7ec21638a
Merged-In: I994fc2a3ada8a90fde8b3a0b4f1cc8d7ec21638a
2022-08-19 06:39:59 +00:00
TreeHugger Robot
1ec0fe9575 Merge "Logs the activated session duration for magnification. (1/2)" into tm-qpr-dev am: 620e37edb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185750

Change-Id: I0a228039c27a3251f53bae367e9e7e244ff6972e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 00:50:27 +00:00
TreeHugger Robot
620e37edb9 Merge "Logs the activated session duration for magnification. (1/2)" into tm-qpr-dev 2022-08-19 00:32:18 +00:00
Daniel Hsieh
5b5226eb81 Logs the activated session duration for magnification. (1/2)
Uses the atom MagnificationTripleTapAndHoldActivatedSessionReported in
westworld to log the activated session duration for the window magnifier
which is triggered by the triple-tap-and-hold gesture.

The duration is from the window magnifier's enabled time to its disabled
time.

Bug: 216733714
Test: atest WindowMagnificationGestureHandlerTest
      m statsd_testdrive & statsd_testdrive 452
Change-Id: I423ac39c167c89b0b2db931a616cdd34d6eb151c
Merged-In: I423ac39c167c89b0b2db931a616cdd34d6eb151c
2022-08-18 18:31:16 +00:00
Fiona Campbell
f73a728509 Add constraints to animation duration scales
Ensure that all uses of ANIMATOR_DURATION_SCALE are bounded between 0
and 20.

Bug: 238178261
Test: adb shell dumpsys window windows | grep "Animation setting"
Change-Id: I1f3797c5cf708f5c02ba8644ea9f703244d229a9
2022-08-18 16:11:39 +00:00
Jernej Virag
0f82abd147 Merge "Prevent loading of Icon resources from the wrong package" into tm-dev am: e1e8b1b932 am: c4ebf2ba2a am: 3234afdaf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19601344

Change-Id: Ic6f224287054df1fd6573ab620f7807cfeef43b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 21:23:04 +00:00
Jernej Virag
3234afdaf3 Merge "Prevent loading of Icon resources from the wrong package" into tm-dev am: e1e8b1b932 am: c4ebf2ba2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19601344

Change-Id: Ibfc955f61506dc3e4aad8e7b19eeb9b8a91e77dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 21:03:38 +00:00
Charles Chen
fac95c2490 Merge "Fix violation in DecorContext" into tm-qpr-dev am: 4cce97fd2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632693

Change-Id: I36bf141b2eea91709e28ddd272e2c694fe2da8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 20:09:37 +00:00
Charles Chen
4cce97fd2e Merge "Fix violation in DecorContext" into tm-qpr-dev 2022-08-16 18:51:03 +00:00
Charles Chen
d9bdee7fa0 Fix violation in DecorContext
The issue happens when activity is launched on the secondary
display. It's because the base context of DecorContext is
a DisplayContext, but we should check #isConfigurationContext in
associatd window's Context instead, like DecorContext#isUiContext

fixes: 242571036
Test: manual - launch activity on the secondary display

Merged-In: Ie2659fb31248ad64099018bfebb6a6b43c72f466
Change-Id: Ie2659fb31248ad64099018bfebb6a6b43c72f466
2022-08-16 15:22:49 +00:00
Joanne Chung
20dbe919b1 Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev am: 9e263e643d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800482

Change-Id: Ie4da503e5f569625c807bef1a194764cb5e133fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 13:08:55 +00:00
Joanne Chung
9e263e643d Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev 2022-08-16 10:00:57 +00:00
Wilson Wu
908c368411 Merge "Refine {SHOW,HIDE}_MY_SOFT_INPUT constants" into tm-qpr-dev am: 08fc972311
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19569434

Change-Id: I4f26a508aa1e2081f4afcdf62ca00dc1d0a1949c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 09:01:38 +00:00
Wilson Wu
08fc972311 Merge "Refine {SHOW,HIDE}_MY_SOFT_INPUT constants" into tm-qpr-dev 2022-08-16 08:37:12 +00:00
Jernej Virag
32f176e470 Prevent loading of Icon resources from the wrong package
If an Icon carries package designator, LocalImageResolver has now
ignored it. This could lead to loading of a wrong icon in cases where
the ID collided with the same ID in android package.

This is fixes that corner-case.

Bug: 241066484
Test: atest LocalImageResolverTest - the new test checks for pkg
      correctness and fails on devices without this cl

      manual test: bluejay device with known, reproducible resource
      collision in media player notification. In reproducible case,
      icon appears as a broken block.

      After applying this patch, small icon in media notification loads
      correctly for the collision case.

Change-Id: Ic79c0d4acb1d347a24282972e009a5a079ce6c21
2022-08-15 10:07:01 +00:00
Mark Renouf
6545c5a0ce More minor cleanups to ScreenshotRequest am: 930b8b78b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19509205

Change-Id: I03d3d91a5b18b93349e6d3c5550d1d0de1082709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 23:55:23 +00:00
Mark Renouf
930b8b78b6 More minor cleanups to ScreenshotRequest
* Adds screenshotType into the request instead of relying on the
Message it is sent in (msg.what).

* Adds a constructor which accepts type, source and topComponent

* Adds more @IntDef annotations to `int` constructor args

Bug: 231957192
Test: atest ScreenshotHelperTest
Change-Id: If4bf8ef1b889e4e7b2fabf195a538a13664cce12
2022-08-12 23:33:53 +00:00
Joanne Chung
9325f9b97e Fix system toolbar doesn't use correct theme.
The toolbar should set the theme to the app's theme. Because the
service cannot get the application context, we should pass this
information from application to service.

Bug: 218833400
Test: manual. Use light/dark theme for app, the toolbar shows with
the same theme
Test: atest TextViewIntegrationTest
Test: atest android.widget.TextViewActivityTest

Change-Id: I6d4e4e117c680ce57e760a87987059eded09b2bc
2022-08-12 16:54:34 +00:00
TreeHugger Robot
6c0ded41ef Merge "Fix lines >100 chars and unnecessary fully-qualified class names" into tm-qpr-dev am: 6bb157dd3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19593554

Change-Id: If80bca5d787a4bd5808e54accd85cf893172eec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:54:14 +00:00
Mark Renouf
020439dcac Fix lines >100 chars and unnecessary fully-qualified class names
Bug: 231957192
Change-Id: If06068802f1358b2708df30338c772d27442266b
Merged-In: If06068802f1358b2708df30338c772d27442266b
2022-08-11 14:35:15 +00:00
Joanne Chung
c4d1b9e6d6 Revert "[DO NOT MERGE] Remove selection toolbar code from build time" am: 888e79f7a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19204106

Change-Id: I2eed4842d349cb38bd488793cd4bfdf672d4c3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:19:11 +00:00
Joanne Chung
9cc6ab62b2 Merge "Revert "[DO NOT MERGE] Remove selection toolbar code from build time"" into tm-qpr-dev 2022-08-10 08:38:51 +00:00
Wilson Wu
2ac25627d8 Refine {SHOW,HIDE}_MY_SOFT_INPUT constants
Naming of SoftInputShowHideReason#{SHOW,HIDE}_MY_SOFT_INPUT
constants may not clear enough to indicate its semantics.

Improve show/hide reasons of InputMethodService by:

-. Update constants naming to {SHOW,HIDE}_SOFT_INPUT_FROM_IME.
-. Introduce respective reasons to indicate different hide request
   cases within IME process.

Bug: 224565148
Bug: 241890033
Test: presubmit
Test: atest CtsInputMethodTestCases and observe logs
Change-Id: I8b148e9b5ab05ff7b827c6b8fe23008ca30a8c4b
Merged-In: I8b148e9b5ab05ff7b827c6b8fe23008ca30a8c4b
2022-08-10 11:51:59 +08:00
TreeHugger Robot
b446de7503 Merge changes from topic "b/232475788-frameworks/base" into tm-qpr-dev am: 317201974a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19457538

Change-Id: Ia79695069f20fe1a66db965780cf7d8532325db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 15:31:09 +00:00
TreeHugger Robot
317201974a Merge changes from topic "b/232475788-frameworks/base" into tm-qpr-dev
* changes:
  Handle install-constraints tag.
  Scaffolding: reject installs based on device fingerprint
2022-08-08 15:12:29 +00:00
Joanne Chung
888e79f7a0 Revert "[DO NOT MERGE] Remove selection toolbar code from build time"
This reverts commit ade911b9c7.

Reason for revert: The feature is planned to run a study in QPR1
with the aim of launching in QPR-2. The code will be removed from
build time before QPR1 finalized.

Change-Id: Ida04260a1196121bb4084b527216aae1e4e6ec54
2022-08-08 11:02:44 +00:00
TreeHugger Robot
979765606d Merge "Avoid too long trace section name to crash FrameTracker" into tm-qpr-dev am: 242b670b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19429366

Change-Id: I11c203a14f1a3f20c1e73640e12174ac89812f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 20:24:00 +00:00
Ahan Wu
41998f864b Avoid too long trace section name to crash FrameTracker
android.os.Trace#beginSection limits the length of the section to 127,
otherwise, a IllegalArgumentException throws. We limit the length before
passing the argument to avoid this.

Bug: 239860117
Test: atest InteractionJankMonitorTest FrameTrackerTest
Change-Id: I3d9cbc65a8036c18680edf11aace0b324a1befb6
2022-08-05 16:53:31 +00:00
Andrey Epin
45fe7a2d68 Merge "Update icon only once" into tm-qpr-dev am: 754656a669
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19263009

Change-Id: I36255c2c1448a7a067f74a8440e5de1cfe824074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 05:06:54 +00:00
Andrey Epin
754656a669 Merge "Update icon only once" into tm-qpr-dev 2022-08-04 04:43:17 +00:00
Andrey Epin
4eb9ef36cb Merge "Set default list view update to 0" into tm-qpr-dev am: d7e183e5ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19212236

Change-Id: I4a6271f2e71deb2f3c72c3f76d0e1bd838d51ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 03:35:13 +00:00
Andrey Epin
d7e183e5ad Merge "Set default list view update to 0" into tm-qpr-dev 2022-08-04 03:13:55 +00:00
Wu Ahan
ef28d3135e Merge "Mark CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK as deprecated CUJ" into tm-qpr-dev am: 699f5e9471
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19429606

Change-Id: I5819ceedfe8917a887e5f0339fd5c52dc0fda516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 16:09:59 +00:00
Wu Ahan
699f5e9471 Merge "Mark CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK as deprecated CUJ" into tm-qpr-dev 2022-08-03 15:49:08 +00:00
Nicolò Mazzucato
e8359bcd81 Merge "Monitor fold to AOD latency" into tm-qpr-dev am: 560e645f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117332

Change-Id: Ie7634ff6dd13e12fc7cf2aa26b52238c9269716a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 12:23:46 +00:00
Nicolò Mazzucato
560e645f3a Merge "Monitor fold to AOD latency" into tm-qpr-dev 2022-08-03 11:52:06 +00:00
TreeHugger Robot
cf7e8cb01f Merge "Fix leakage of pointer location" into tm-qpr-dev am: 7f96bd5a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19465302

Change-Id: I822d4225329357df7ee34807f391f6956c721a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 11:36:56 +00:00
TreeHugger Robot
7f96bd5a88 Merge "Fix leakage of pointer location" into tm-qpr-dev 2022-08-03 11:12:10 +00:00
Nicolo' Mazzucato
1a1976c329 Monitor fold to AOD latency
This logs the latency from when we receive the device state change (device folded), to when the AOD animation starts.

Bug: 237270816
Test: atest FoldAodAnimationControllerTest
Change-Id: I67e0e04bbc24064640f46cdc8feb667814170529
Merged-In: I67e0e04bbc24064640f46cdc8feb667814170529
2022-08-03 09:23:04 +00:00
Cliff Wu
dc15efd4ad Merge "Fix generic wrong strings to comply with the UX guideline" into tm-qpr-dev am: 0bc5eed6fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871018

Change-Id: I4eddfbf9ccf18148e3bc9a04c631d59c8f41bb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:19:51 +00:00
Cliff Wu
0bc5eed6fa Merge "Fix generic wrong strings to comply with the UX guideline" into tm-qpr-dev 2022-08-02 23:13:14 +00:00
Mark Renouf
dcc2bb37a3 Adds OWNERS for ScreenshotHelper
This code is managed as part of SystemUI screenshots.

(This is a manual cherrypick of
27df215eba from AOSP.)

Change-Id: I624a52754cffcca66798d2813d25d8896597a39a
2022-08-02 10:55:15 +00:00
Arthur Hung
5a47857643 Fix leakage of pointer location
When display is removing, we should explicitly remove the pointer
location view to ensure the client object would be released.

Bug: 239078899
Test: Enabled pointer location, add/remove virtual display, check if
      the surface would be released.
Change-Id: I89ef3dc8e5b4aa8c3b7d5c1393d6543a9d3d67db
2022-08-02 09:38:35 +00:00
Cliff Wu
d1f854d2c0 Fix generic wrong strings to comply with the UX guideline
- The generic error need to remove "Unavailable" in the header and
only show body text.
- The "Play Store" app needs to be added to the error for a specific
app and it says "Play Store not available".
- Dialer app uses generic alert dialog.

Bug: 230048652
Test: Manual, atest FrameworksServicesTests:VirtualDeviceManagerServiceTest
Change-Id: I8b56e2804c3204901a3551d3300ab8c0391e7260
2022-08-02 04:18:34 +00:00
Treehugger Robot
83de951846 Merge "Adds OWNERS for ScreenshotHelper" am: 3614185d38 am: 115e87852f am: 2957668101 am: 14d73d065f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2168665

Change-Id: I22facf3b0f1125936c64c59e9a8e5d81559fa1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 20:26:49 +00:00
Treehugger Robot
115e87852f Merge "Adds OWNERS for ScreenshotHelper" am: 3614185d38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2168665

Change-Id: I57e4f422318fc35b31fe6ec2cc7ec06d01eda317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 19:39:19 +00:00
Mark Renouf
6b376862d0 Merge "Code cleanup of ScreenshotRequest and usages" into tm-qpr-dev am: bbbfa95637
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19377517

Change-Id: I48b3e476f874bd81b5f1af53ed5f1757f4640bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 19:38:13 +00:00