Commit Graph

750479 Commits

Author SHA1 Message Date
Tiger Huang
fa1ec597ca Refine PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT
- If a window has PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT, the final
  frame might be larger than the requested size, and we cannot use the
  requested lengths to compute the window frame. Because the window size
  will be the new requested size, we don't want to extend the window
  size again and again.

- When we are checking if a frame is overlapped with the display cutout,
  we only need to check if displayCutoutSafe contains the frame. We
  don't need to check individual bounding rectangles. This also fixes an
  issue that the gestural navigation bar is not extended by the
  waterfall cutout because it doesn't have bounding rectangles.

Bug: 203031262
Bug: 161810301
Test: Enable double cutout or waterfall cutout in developer options and
      see if the frame of navigation bar is correct when it is at the
      same side of the cutout.
Change-Id: Ic8c090198c556f2dc3b2c0b8498c42e9ca18c795
2022-03-17 00:58:29 +08:00
TreeHugger Robot
54102c21f2 Merge "Fix frozen notifications after bouncer dismissal" into tm-dev 2022-03-06 19:22:31 +00:00
TreeHugger Robot
7fe1c1386d Merge "Transfer PipContentOverlay when swipe to home with Shell transition" into tm-dev 2022-03-05 15:34:07 +00:00
Aaron Huang
005da24a4c Merge "Fix proto invalid write type" into tm-dev 2022-03-05 07:43:09 +00:00
Alex Buynytskyy
6d00054089 Merge "Always restart apps if base.apk gets updated." into tm-dev 2022-03-05 05:40:17 +00:00
TreeHugger Robot
ed1835b7fa Merge changes from topic "revert-17073604-presubmit-am-787ed0a55f5040968a8a9c14764ddd01-HJDYCJUYCZ" into tm-dev
* changes:
  Revert "Scrim was flickering on FPS unlock"
  Revert "Remove temp user creation activity"
2022-03-05 04:45:53 +00:00
TreeHugger Robot
d7a879e665 Merge changes from topic "merge-input-config-feature-tm" into tm-dev
* changes:
  Use InputConfig flags in InputWindowHandle API
  WindowInfo: Merge InputConfig and Feature flags
2022-03-05 03:53:59 +00:00
Shashwat Razdan
9e1538b8c7 Merge changes from topic "revert-17060491-revert-17008428-cherrypick-multi-provider-cloudsearch-2yrjp5zxz1-WHCUFOAJWF-WKGCSSGIPI" into tm-dev
* changes:
  Fixing multi provider support in AbstractMasterSystemService
  Revert "Revert "Adding multiple provider support in AbstractMast..."
2022-03-05 03:46:10 +00:00
Matt Casey
15bb168f46 Merge "Ignore all input outside of clipboard UI" into tm-dev 2022-03-05 02:42:59 +00:00
Bryce Lee
5c62dd44b9 Revert "Scrim was flickering on FPS unlock"
Revert submission 17073604-presubmit-am-787ed0a55f5040968a8a9c14764ddd01

Reason for revert: cause of b/222711091
Reverted Changes:
I3aae23a57:Remove temp user creation activity
I6b2ce8e01:Scrim was flickering on FPS unlock

Change-Id: Ie8f02829b9bc9bdd533343d6011e352a00d26776
2022-03-05 01:49:50 +00:00
Bryce Lee
1bdc8afc0c Revert "Remove temp user creation activity"
Revert submission 17073604-presubmit-am-787ed0a55f5040968a8a9c14764ddd01

Reason for revert: cause of b/222711091
Reverted Changes:
I3aae23a57:Remove temp user creation activity
I6b2ce8e01:Scrim was flickering on FPS unlock

Change-Id: I7dcea569feaae4f03b634a13b3a33c3b45abeb53
2022-03-05 01:49:50 +00:00
Nate Myren
410e1b73f2 Merge "Add settings intelligence config" into tm-dev 2022-03-05 01:48:36 +00:00
Aaron Liu
ed72c410a9 Merge "Bouncer: Add title for each auth screen." into tm-dev 2022-03-05 01:38:08 +00:00
Sal Savage
28cb4aaf7c Merge "Remove usages of HFP Client audio state APIs" into tm-dev 2022-03-05 01:38:05 +00:00
TreeHugger Robot
df11d2d50c Merge "Prevent optimization of common code between framework/sysui" into tm-dev 2022-03-05 01:32:25 +00:00
James.cf Lin
3674b1c215 Move the new added attr LineBreakStyle to the version T section.
The two attributes LineBreakStyle and LineBreakWordStyle were added in the version S-V2 section in the public.xml file. Move two attributes to the version T section in the public.xml file.

This violates resource finalization, but is done in an attempt to
reconcile differences between master and tm-dev.

Bug: 221172449
Test: atest TextViewTest; atest MeasuredTextTest; atest PrecomputedTextTest; atest TextViewPrecomputedTextTest
Merged-In: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
Change-Id: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
(cherry picked from commit 255581f097)
2022-03-05 01:15:30 +00:00
Winson Chiu
c4ab817595 Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc", "presubmit-am-db10d76a65b5494fb2108722543f3813" into tm-dev
* changes:
  Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS
  Revert 'Adding definitions for AccessibilityAction directional swipes.'
2022-03-05 01:03:35 +00:00
yingleiw
a3a06ac231 Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS
Fix: 217730256

Bug: 222537368

Test: Added test in EditTextTest (will merge later when reviewed).

Merged-In: I78354a0f1d955c5b7c1ead044ea49086b3479841
Change-Id: I78354a0f1d955c5b7c1ead044ea49086b3479841
(cherry picked from commit e1f392d171)
2022-03-04 16:42:54 -08:00
Jing Ji
d00d9c2bde Merge "Reset the subreason field while reusing the AppExitInfoTracker record" into tm-dev 2022-03-05 00:42:52 +00:00
Michael Groover
aeb6b72fcd [automerger skipped] Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev am: 7026055322 am: ff844f4337 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: Iabe1b33048be61e2fe22a4d5e8f3a539a2f5a1f2
2022-03-05 00:26:33 +00:00
Michael Groover
e0cf3e3a84 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp am: dd244b19a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: I694ce6d9211266c226198244e3ea2d22e5419cd5
2022-03-05 00:25:59 +00:00
Presubmit Automerger Backend
2e1878e73d [automerger skipped] [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee am: 659d441a9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: I266a49032c34f999e451f4de2c6fe2ae5db46861
2022-03-05 00:25:36 +00:00
Michael Groover
ff844f4337 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev am: 7026055322
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: Id1d3ebadd53f391268183ce27f57216e045134c3
2022-03-05 00:25:21 +00:00
Sukanya Rajkhowa
b6e9b03b83 VoWifi notification for emergency calls
- Add new intent to send VOWIFI_ENABLED status

Bug: 179122732
Test: Manually verified by simulating
Change-Id: Iaf52a642a0435a070b8280b098e7929cddde55f6
2022-03-05 00:07:30 +00:00
Michael Groover
dd244b19a4 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp
* changes:
  [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee
  [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"
2022-03-05 00:02:48 +00:00
Michael Groover
7026055322 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev 2022-03-05 00:02:48 +00:00
TreeHugger Robot
5a8bea1a5d Revert 'Adding definitions for AccessibilityAction directional swipes.'
This reverts commit 0de71ca543.

Reason for revert: Don't yet have a use for the definitions,
and will likely reimplement them differently. This is an adjusted
revert to account for a resource finalization error

Test: Is a reversion.

Bug: 222537368

Merged-In: I99a71551069069d117039af4708030772b741cea
Change-Id: I99a71551069069d117039af4708030772b741cea
(cherry picked from commit 65e5bf07c2)
2022-03-04 15:45:46 -08:00
William Leshner
786c9acaa6 Merge "Add error log for adding parented complications." into tm-dev 2022-03-04 23:36:45 +00:00
TreeHugger Robot
d3672e192a Merge "Add a test API to query audio HAL version." into tm-dev 2022-03-04 23:26:24 +00:00
Shashwat Razdan
52cd7f6bde Fixing multi provider support in AbstractMasterSystemService
Bug: 222221754
Test: atest CtsSpeechTestCases https://paste.googleplex.com/4705640246149120 [The test which was broken]
Change-Id: I6bf10c6176dfd12560cda896128a1e549cdaa1fb
2022-03-04 23:00:17 +00:00
Lyn Han
91ed91311a Fix frozen notifications after bouncer dismissal
Distinguish between two types of fling-down on keyguard:
1) the kind after a swipe-up that does not show bouncher
	=> keep stack height the same
2) the kind after showing bouncer
	=> update stack height

Move NSSL#mIsFlinging to AmbientState

Bug: 219883571
Test: unlock hint, swipe up, show/hide bouncer => no stack freeze
Change-Id: I7af1a4f941d009f05e3fc9dc667a035d19e87d62
(cherry picked from commit 65da9766c0)
Merged-In: I7af1a4f941d009f05e3fc9dc667a035d19e87d62
2022-03-04 22:58:49 +00:00
Bryce Lee
836db75e0f Merge "Remove communal support from SystemUI." into tm-dev 2022-03-04 22:50:50 +00:00
Winson Chiu
2222f486b2 Merge "AAPT2: support removed_ entries in groups" into tm-dev 2022-03-04 22:48:41 +00:00
Jing Ji
0362d22597 Reset the subreason field while reusing the AppExitInfoTracker record
Bug: 222752166
Test: manual - dumpsys activity exit-info
Change-Id: I131aee7a87290b0dc31688f9eb779f2f1772237a
2022-03-04 14:14:12 -08:00
TreeHugger Robot
5302762a22 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours am: 3208bd64e6 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I29a676b5765db32103b143c52fa7eb8ef44369a0
2022-03-04 22:12:45 +00:00
TreeHugger Robot
4900eace9c [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am: b6f75ad032 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: If58226e72280f452700c55754a0fba7f7686996e
2022-03-04 22:12:29 +00:00
Presubmit Automerger Backend
71c381f4f9 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours am: 2646e5f055 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I0d8dea3d2f35d5a3f4a6af5082875a69ff665df3
2022-03-04 22:12:17 +00:00
TreeHugger Robot
3208bd64e6 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I97f08a777ff6855ec16668e8d76b5a38a1f77b3e
2022-03-04 22:11:57 +00:00
Eric Biggers
4fb38d5fc3 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 am: 089a351d31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I87cbb67af5e1dc62ddbb8ff7d58a256ee4569b44
2022-03-04 22:11:49 +00:00
TreeHugger Robot
b6f75ad032 [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I1965542abd5e922360de52c2019bfc623161121e
2022-03-04 22:11:38 +00:00
Presubmit Automerger Backend
2646e5f055 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I37861b22fdb553585b8a800fde6e0e5bec849494
2022-03-04 22:11:18 +00:00
Aaron Liu
22941ed02d Bouncer: Add title for each auth screen.
On reset state in the view controller, set the security message to be
the default text. It seems like this copy already exists.

Bug: b/218833792
Test: Manual test on multiple devices
Change-Id: I5d704255622864a8593ce1b31747a36ec95224bb
2022-03-04 22:07:44 +00:00
Jared Duke
83a28e6a9d Prevent optimization of common code between framework/sysui
This is a temporary fix to ensure that SystemUI builds code that is
consistent with common code that might be referneced in the the bootclasspath.
Note that a proper fix would be to entirely eliminate these duplicated classes,
but for now this avoids any related issues, and eliminates issues when
running coverage tests against optimized builds.

Bug: 219615928,222468116
Test: m -j EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
  + validate successful coverage test runs
Change-Id: I67b7ad1d6f8e1fb2352652d452c620d195d5c0dc
2022-03-04 14:05:54 -08:00
Xiaowen Lei
788fe7cdb6 Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener." into tm-dev 2022-03-04 22:04:52 +00:00
Xiaowen Lei
94184ccae9 Merge "Add SharedPreferences keys for the nudge to setup dream." into tm-dev 2022-03-04 22:04:08 +00:00
TreeHugger Robot
a5ab5d5836 Merge "RemoteViews: don't crash on null display in getLaunchOptions" into tm-dev 2022-03-04 22:00:55 +00:00
TreeHugger Robot
cd1aea8ecb [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 2b511619a5 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: Id011914db2cb57b5d567ff6ca52b1e6fdd79d9eb
2022-03-04 21:50:46 +00:00
TreeHugger Robot
2c39d9f723 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: I6ff06b5186ce8371940d49b26e2197475c7e04cd
2022-03-04 21:50:32 +00:00
Eric Biggers
089a351d31 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I14ae3ace2717e7c09d06e509c51761285a3b84d0
2022-03-04 21:50:29 +00:00
TreeHugger Robot
0280801eea [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-mainline-prod am: ac3dbb418a -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865

Change-Id: Ieef79513ae4e8576ae216a7996f4559f1853c197
2022-03-04 21:50:29 +00:00